jest/dreampad
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/yuanjunyao_dev' into yuanjunyao_dev

Browse Source 
# Conflicts:
#	lib/app/modules/home/views/home_view.dart
#	lib/app/modules/select/controllers/select_controller.dart
This commit is contained in:
yuanjunyao 2023-11-30 15:24:08 +08:00
commit 0d9aee1ed4
5 changed files with 58 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/app/modules/home/views/home_view.dart
View File

@ -557,11 +557,12 @@ class HomeView extends GetView<HomeController> {
)
: Container(),
controller.explored2.value >= 1 ? firstLeafWidget() : Container(),
LanternWidget(
controller.explored2.value >= 4
?LanternWidget(
brightCount: controller.exploreCount.value >= 2
? controller.exploreDay.value
: controller.exploreDay.value - 1,
),
): Container(),
Positioned(
left: 168.w,
top: 244.h,

54
lib/app/modules/home/widgets/lantern_widget.dart
View File

@ -15,33 +15,35 @@ class LanternWidget extends GetView {
return Positioned(
right: 60.w,
top: 346.h,
child: Container(
height: 90.h,
width: 180.w,
decoration: const BoxDecoration(
image: DecorationImage(
image: Images.homeLantern,
fit: BoxFit.fill,
child: ShowUp(
child: Container(
height: 90.h,
width: 180.w,
decoration: const BoxDecoration(
image: DecorationImage(
image: Images.homeLantern,
fit: BoxFit.fill,
),
),
child: Stack(
clipBehavior: Clip.none,
children: [
brightCount! >= 1
? Positioned(
left: -9.w,
top: 36.h,
child: Images.homeLanternBright,
)
: Container(),
brightCount! >= 2
? Positioned(
left: 18.w,
top: 27.h,
child: Images.homeLanternBright,
)
: Container(),
],
),
),
child: Stack(
clipBehavior: Clip.none,
children: [
brightCount! >= 1
? Positioned(
left: -9.w,
top: 36.h,
child: Images.homeLanternBright,
)
: Container(),
brightCount! >= 2
? Positioned(
left: 18.w,
top: 27.h,
child: Images.homeLanternBright,
)
: Container(),
],
),
),
);

2
lib/app/modules/select/controllers/select_controller.dart
View File

@ -121,7 +121,7 @@ class SelectController extends GetxController {
enName: 'academician',
vImage: 'btn_female_pic_academician',
hImage: 'pic_female_academician',
enable: true,
enable: false,
));
occupations.add(Occupation(
id: 2,

24
lib/app/shared/widgets/show_up.dart Normal file
View File

@ -0,0 +1,24 @@
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
class ShowUp extends HookWidget {
const ShowUp({
super.key,
required this.child,
});
final Widget child;
@override
Widget build(BuildContext context) {
final controller =
useAnimationController(duration: const Duration(milliseconds: 300));
useMemoized(() {
controller.forward();
});
return FadeTransition(
opacity: CurvedAnimation(curve: Curves.easeIn, parent: controller),
child: child,
);
}
}

3
lib/app/shared/widgets/widgets.dart
View File

@ -9,4 +9,5 @@ export 'my_back_button.dart';
export 'question_dialog.dart';
export 'swipe_next_page_container.dart';
export 'animated_visibility_widget.dart';
export 'animated_column_widget.dart';
export 'animated_column_widget.dart';
export 'show_up.dart';