amirreza.chegini
/
hade_hoda_flutter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

add:some changes

pull/10/head
AmirrezaChegini 6 days ago
parent
9431d18d2e
commit
22b587e0ed
17 changed files with 283 additions and 188 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      android/app/src/main/AndroidManifest.xml
  2. 196
      assets/json/levels.json
  3. 2
      lib/common_ui/theme/theme_service.dart
  4. 2
      lib/core/routers/my_routes.dart
  5. 11
      lib/core/utils/storage_path.dart
  6. 33
      lib/core/widgets/answer_box/answer_box.dart
  7. 31
      lib/core/widgets/answer_box/styles/picture_box.dart
  8. 6
      lib/core/widgets/answer_box/styles/text_box.dart
  9. 3
      lib/features/intro/presentation/ui/intro_page.dart
  10. 27
      lib/features/level/presentation/bloc/level_bloc.dart
  11. 14
      lib/features/level/presentation/ui/level_page.dart
  12. 6
      lib/features/question/presentation/bloc/question_bloc.dart
  13. 8
      lib/features/question/presentation/bloc/question_event.dart
  14. 9
      lib/features/question/presentation/bloc/question_state.dart
  15. 103
      lib/features/question/presentation/ui/question_page.dart
  16. 17
      lib/features/question/presentation/ui/widgets/question_stepper.dart
  17. 2
      lib/main.dart

1
android/app/src/main/AndroidManifest.xml
View File

@ -1,4 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<application
android:label="hadi_hoda_flutter"
android:name="${applicationName}"

196
assets/json/levels.json
View File

@ -35,9 +35,9 @@
"title": "We walk in the yard with a glass of juice",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer1_82OrRAN.jpeg",
"filename": "answer1_82OrRAN.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -59,9 +59,9 @@
"title": "Take it and throw it away without saying anything",
"image_id": "f9f0bad05f",
"image_info": {
"filename": "answer1_w0EyoOQ.jpeg",
"filename": "answer1_w0EyoOQ.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 4,
"is_active": true
@ -86,9 +86,9 @@
"title": "Morning after waking up and night before sleeping",
"image_id": "af38813ccc",
"image_info": {
"filename": "answer2_F42cGzw.jpeg",
"filename": "answer2_F42cGzw.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 1,
"is_active": true
@ -98,9 +98,9 @@
"title": "Only when we have toothache",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer1_rzFgkLQ.jpeg",
"filename": "answer1_rzFgkLQ.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -110,9 +110,9 @@
"title": "Only on weekends",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer2_4bPWCnw.jpeg",
"filename": "answer2_4bPWCnw.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -149,9 +149,9 @@
"title": "Twice a day",
"image_id": "af38813ccc",
"image_info": {
"filename": "answer1_KETj6i3.jpeg",
"filename": "answer1_KETj6i3.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 1,
"is_active": true
@ -161,9 +161,9 @@
"title": "Once a day",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer1_9VovGd0.jpeg",
"filename": "answer1_9VovGd0.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -173,9 +173,9 @@
"title": "Three times a day",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer2_Dt5fAsU.jpeg",
"filename": "answer2_Dt5fAsU.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -185,9 +185,9 @@
"title": "Only when she remembers",
"image_id": "f9f0bad05f",
"image_info": {
"filename": "answer1_o9la4sD.jpeg",
"filename": "answer1_o9la4sD.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 4,
"is_active": true
@ -219,9 +219,9 @@
"title": "She washes her hands before eating",
"image_id": "af38813ccc",
"image_info": {
"filename": "answer1_C2dAmzG.jpeg",
"filename": "answer1_C2dAmzG.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 1,
"is_active": true
@ -231,9 +231,9 @@
"title": "She eats with dirty hands",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer2_4oYaj60.jpeg",
"filename": "answer2_4oYaj60.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -243,9 +243,9 @@
"title": "She spills food on the ground",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer1_MV4vliK.jpeg",
"filename": "answer1_MV4vliK.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -255,9 +255,9 @@
"title": "She eats with her mouth open",
"image_id": "f9f0bad05f",
"image_info": {
"filename": "answer1_Bh6JUWv.jpeg",
"filename": "answer1_Bh6JUWv.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 4,
"is_active": true
@ -294,9 +294,9 @@
"title": "Hello",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer1_BfJLxDD.jpeg",
"filename": "answer1_BfJLxDD.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -345,9 +345,9 @@
"title": "Slowly and calmly",
"image_id": "af38813ccc",
"image_info": {
"filename": "answer1_gCLGHBG.jpeg",
"filename": "answer1_gCLGHBG.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 1,
"is_active": true
@ -357,9 +357,9 @@
"title": "Very quickly",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer2_9A6rnMB.jpeg",
"filename": "answer2_9A6rnMB.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -369,9 +369,9 @@
"title": "Loudly",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer2_19p9V2Z.jpeg",
"filename": "answer2_19p9V2Z.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -381,9 +381,9 @@
"title": "While running",
"image_id": "f9f0bad05f",
"image_info": {
"filename": "answer1_JzbIvAs.jpeg",
"filename": "answer1_JzbIvAs.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 4,
"is_active": true
@ -415,9 +415,9 @@
"title": "She washes her hands before sleeping",
"image_id": "af38813ccc",
"image_info": {
"filename": "answer2_nwvb7rC.jpeg",
"filename": "answer2_nwvb7rC.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 1,
"is_active": true
@ -439,9 +439,9 @@
"title": "She sleeps with shoes on",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer2_JVVfxGq.jpeg",
"filename": "answer2_JVVfxGq.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -490,9 +490,9 @@
"title": "Hello",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer2_dA1hKmO.jpeg",
"filename": "answer2_dA1hKmO.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -502,9 +502,9 @@
"title": "Goodbye",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer2_mOYRhA8.jpeg",
"filename": "answer2_mOYRhA8.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -514,9 +514,9 @@
"title": "Nothing",
"image_id": "f9f0bad05f",
"image_info": {
"filename": "answer1_6cc7bff.jpeg",
"filename": "answer1_6cc7bff.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 4,
"is_active": true
@ -541,9 +541,9 @@
"title": "Regular and early time",
"image_id": "af38813ccc",
"image_info": {
"filename": "answer1_f54wbXf.jpeg",
"filename": "answer1_f54wbXf.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 1,
"is_active": true
@ -553,9 +553,9 @@
"title": "Whenever she likes",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer1_m040LzQ.jpeg",
"filename": "answer1_m040LzQ.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -565,9 +565,9 @@
"title": "Midnight",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer2_uqP0F9g.jpeg",
"filename": "answer2_uqP0F9g.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -611,9 +611,9 @@
"title": "She wears clean and neat clothes",
"image_id": "af38813ccc",
"image_info": {
"filename": "answer2_A84bsAn.jpeg",
"filename": "answer2_A84bsAn.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 1,
"is_active": true
@ -623,9 +623,9 @@
"title": "She wears dirty clothes",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer2_QM5Wdvi.jpeg",
"filename": "answer2_QM5Wdvi.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -635,9 +635,9 @@
"title": "She wears torn clothes",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer2_tXODAh2.jpeg",
"filename": "answer2_tXODAh2.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -647,9 +647,9 @@
"title": "She doesn't wear any clothes",
"image_id": "f9f0bad05f",
"image_info": {
"filename": "answer2_whh6588.jpeg",
"filename": "answer2_whh6588.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 4,
"is_active": true
@ -674,9 +674,9 @@
"title": "Comfortable and appropriate clothes",
"image_id": "af38813ccc",
"image_info": {
"filename": "answer1_yPRbPmr.jpeg",
"filename": "answer1_yPRbPmr.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 1,
"is_active": true
@ -686,9 +686,9 @@
"title": "Tight and uncomfortable clothes",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer2_uRVCkPW.jpeg",
"filename": "answer2_uRVCkPW.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -698,9 +698,9 @@
"title": "Big and loose clothes",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer2_CkVrLZ9.jpeg",
"filename": "answer2_CkVrLZ9.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -761,9 +761,9 @@
"title": "Eat food",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer1_sLLo3y5.jpeg",
"filename": "answer1_sLLo3y5.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -773,9 +773,9 @@
"title": "Do nothing",
"image_id": "f9f0bad05f",
"image_info": {
"filename": "answer2_K4AErHQ.jpeg",
"filename": "answer2_K4AErHQ.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 4,
"is_active": true
@ -819,9 +819,9 @@
"title": "Take a bath once a week",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer2_nImB8qj.jpeg",
"filename": "answer2_nImB8qj.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -831,9 +831,9 @@
"title": "Take a bath once a month",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer1_kondYqe.jpeg",
"filename": "answer1_kondYqe.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -843,9 +843,9 @@
"title": "Never take a bath",
"image_id": "f9f0bad05f",
"image_info": {
"filename": "answer1_m39DWKt.jpeg",
"filename": "answer1_m39DWKt.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 4,
"is_active": true
@ -882,9 +882,9 @@
"title": "Once",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer2_y1cBc6f.jpeg",
"filename": "answer2_y1cBc6f.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -894,9 +894,9 @@
"title": "Never",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer1_NoFjFsV.jpeg",
"filename": "answer1_NoFjFsV.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -933,9 +933,9 @@
"title": "Wash her hands with soap",
"image_id": "af38813ccc",
"image_info": {
"filename": "answer1_Q128oR0.jpeg",
"filename": "answer1_Q128oR0.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 1,
"is_active": true
@ -945,9 +945,9 @@
"title": "Do nothing",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer1_XXPgA9y.jpeg",
"filename": "answer1_XXPgA9y.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -957,9 +957,9 @@
"title": "Just rinse with water",
"image_id": "d5d36b44e7",
"image_info": {
"filename": "answer2_ppNdIEg.jpeg",
"filename": "answer2_ppNdIEg.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 3,
"is_active": true
@ -1003,9 +1003,9 @@
"title": "We carefully clean our teeth with a toothbrush",
"image_id": "af38813ccc",
"image_info": {
"filename": "answer1_bqavfEH.jpeg",
"filename": "answer1_bqavfEH.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 1,
"is_active": true
@ -1015,9 +1015,9 @@
"title": "We walk in the yard with a glass of juice",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer1_kqoMwPH.jpeg",
"filename": "answer1_kqoMwPH.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -1039,9 +1039,9 @@
"title": "Take it and throw it away without saying anything",
"image_id": "f9f0bad05f",
"image_info": {
"filename": "answer2_1gNQBhl.jpeg",
"filename": "answer2_1gNQBhl.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 4,
"is_active": true
@ -1078,9 +1078,9 @@
"title": "Only when we have toothache",
"image_id": "c290649fdb",
"image_info": {
"filename": "answer2_W5wOqId.jpeg",
"filename": "answer2_W5wOqId.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 2,
"is_active": true
@ -1129,9 +1129,9 @@
"title": "Twice a day",
"image_id": "af38813ccc",
"image_info": {
"filename": "answer1_YcFpeE7.jpeg",
"filename": "answer1_YcFpeE7.png",
"size": 320543,
"extension": ".jpeg"
"extension": ".png"
},
"order": 1,
"is_active": true
@ -1165,9 +1165,9 @@
"title": "Only when she remembers",
"image_id": "f9f0bad05f",
"image_info": {
"filename": "answer2_EpzvwMB.jpeg",
"filename": "answer2_EpzvwMB.png",
"size": 346421,
"extension": ".jpeg"
"extension": ".png"
},
"order": 4,
"is_active": true

2
lib/common_ui/theme/theme_service.dart
View File

@ -25,7 +25,7 @@ class ThemeService {
case 'light':
return ThemeMode.light;
default:
return ThemeMode.system;
return ThemeMode.light;
}
}
}

2
lib/core/routers/my_routes.dart
View File

@ -25,7 +25,7 @@ class Routes {
}
GoRouter get appPages => GoRouter(
initialLocation: Routes.levelPage,
initialLocation: Routes.introPage,
navigatorKey: ContextProvider.navigatorKey,
routes: [
GoRoute(

11
lib/core/utils/storage_path.dart
View File

@ -0,0 +1,11 @@
import 'dart:io';
import 'package:path_provider/path_provider.dart';
class StoragePath {
static Directory applicationDir = Directory('');
static Future<void> getApplicationDir() async {
applicationDir = await getApplicationDocumentsDirectory();
}
}

33
lib/core/widgets/answer_box/answer_box.dart
View File

@ -1,39 +1,40 @@
import 'package:flutter/material.dart';
import 'package:hadi_hoda_flutter/core/utils/storage_path.dart';
import 'package:hadi_hoda_flutter/core/widgets/answer_box/styles/picture_box.dart';
import 'package:hadi_hoda_flutter/core/widgets/answer_box/styles/text_box.dart';
import 'package:hadi_hoda_flutter/features/question/domain/entity/answer_entity.dart';
import 'package:path_provider/path_provider.dart';
class AnswerBox extends StatefulWidget {
const AnswerBox({super.key});
class AnswerBox extends StatelessWidget {
const AnswerBox({super.key, required this.answer,this.selected, this.onTap, required this.index});
@override
State<AnswerBox> createState() => _AnswerBoxState();
}
class _AnswerBoxState extends State<AnswerBox> {
bool selected = false;
final AnswerEntity answer;
final bool? selected;
final Function(AnswerEntity answer)? onTap;
final int index;
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () {
setState(() {
selected = !selected;
});
},
onTap: () => onTap?.call(answer),
child: SizedBox(
child: Stack(
alignment: Alignment.bottomCenter,
clipBehavior: Clip.none,
children: [
AnswerPictureBox(
selected: selected,
selected: selected ?? false,
index: index,
image: '${StoragePath.applicationDir.path}/data/${answer
.imageId}${answer.imageInfo?.extension ?? '.png'}',
),
Positioned(
left: 0,
right: 0,
bottom: -36,
child: AnswerTextBox(),
child: AnswerTextBox(
text: answer.title ?? '',
),
),
],
),

31
lib/core/widgets/answer_box/styles/picture_box.dart
View File

@ -1,3 +1,5 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart';
@ -6,9 +8,11 @@ import 'package:hadi_hoda_flutter/common_ui/theme/my_theme.dart';
import 'package:hadi_hoda_flutter/core/utils/my_image.dart';
class AnswerPictureBox extends StatelessWidget {
const AnswerPictureBox({super.key, required this.selected});
const AnswerPictureBox({super.key, required this.selected, required this.image, required this.index});
final bool selected;
final String image;
final int index;
@override
Widget build(BuildContext context) {
@ -19,10 +23,11 @@ class AnswerPictureBox extends StatelessWidget {
clipper: _SvgCustomClipper(),
child: Stack(
children: [
MyImage(
image: MyAssets.backgroundHome,
Image.file(
File(image),
fit: BoxFit.cover,
size: 170,
height: 170,
width: 170,
),
PositionedDirectional(
top: MySpaces.s12,
@ -44,7 +49,7 @@ class AnswerPictureBox extends StatelessWidget {
),
),
child: Text(
'1',
'$index',
style: GoogleFonts.marhey(
fontSize: 17,
fontWeight: FontWeight.w600,
@ -54,14 +59,14 @@ class AnswerPictureBox extends StatelessWidget {
),
),
),
PositionedDirectional(
top: MySpaces.s14,
end: MySpaces.s12,
child: MyImage(
image: MyAssets.correct,
size: MySpaces.s40,
),
),
// PositionedDirectional(
// top: MySpaces.s14,
// end: MySpaces.s12,
// child: MyImage(
// image: MyAssets.correct,
// size: MySpaces.s40,
// ),
// ),
],
),
),

6
lib/core/widgets/answer_box/styles/text_box.dart
View File

@ -3,7 +3,9 @@ import 'package:google_fonts/google_fonts.dart';
import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart';
class AnswerTextBox extends StatelessWidget {
const AnswerTextBox({super.key});
const AnswerTextBox({super.key, required this.text});
final String text;
@override
Widget build(BuildContext context) {
@ -22,7 +24,7 @@ class AnswerTextBox extends StatelessWidget {
),
),
child: Text(
'We walk in the yard with a glass of juice ',
text,
textAlign: TextAlign.center,
style: GoogleFonts.marhey(
fontSize: 14,

3
lib/features/intro/presentation/ui/intro_page.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart';
import 'package:hadi_hoda_flutter/common_ui/resources/my_spaces.dart';
import 'package:hadi_hoda_flutter/core/utils/my_image.dart';
import 'package:hadi_hoda_flutter/core/utils/screen_size.dart';
import 'package:hadi_hoda_flutter/features/intro/presentation/bloc/intro_bloc.dart';
@ -56,7 +57,7 @@ class _IntroPageState extends State<IntroPage> {
Positioned _loading(BuildContext context) {
return Positioned(
bottom: MediaQuery.viewPaddingOf(context).bottom,
bottom: MediaQuery.viewPaddingOf(context).bottom + MySpaces.s10,
child: IntroLoadingWidget(
percent: 80,
loadingStream: context.read<IntroBloc>().loadingStream,

27
lib/features/level/presentation/bloc/level_bloc.dart
View File

@ -17,7 +17,12 @@ class LevelBloc extends Bloc<LevelEvent, LevelState> {
this._getLeveslUseCase,
) : super(const LevelState()) {
on<GetLevelListEvent>(_getLevelListEvent);
on<ChooseLevelEvent>(_chooseLevelEvent);
}
@override
Future<void> close() {
scrollController.dispose();
return super.close();
}
/// ------------UseCases------------
@ -30,7 +35,7 @@ class LevelBloc extends Bloc<LevelEvent, LevelState> {
LevelLocation(bottom: 150, left: 60, index: 3),
LevelLocation(bottom: 210, left: 120, index: 4),
LevelLocation(bottom: 250, right: 60, index: 5),
LevelLocation(top: 170, right: 40, index: 6),
LevelLocation(top: 150, right: 40, index: 6),
LevelLocation(top: 70, right: 70, index: 7),
LevelLocation(top: -20, right: 70, index: 8),
];
@ -55,12 +60,9 @@ class LevelBloc extends Bloc<LevelEvent, LevelState> {
/// ------------Controllers------------
final ScrollController scrollController = ScrollController();
/// ------------Functions------------
FutureOr<void> _chooseLevelEvent(ChooseLevelEvent event,
Emitter<LevelState> emit) async {
emit(state.copyWith(chooseLevel: event.level));
}
void goToQuestionPage(BuildContext context, LevelEntity level){
context.pushNamed(
@ -76,12 +78,21 @@ class LevelBloc extends Bloc<LevelEvent, LevelState> {
Emitter<LevelState> emit) async {
await _getLeveslUseCase(LevelParams()).then((value) {
value.fold(
(data) {
(data) async {
bottom8LevelList.addAll(data.take(8));
if(data.length > 8){
top12LevelList.addAll(data.sublist(8, data.length));
}
emit(state.copyWith(getLevelStatus: const BaseComplete('')));
emit(state.copyWith(
getLevelStatus: const BaseComplete(''),
chooseLevel: data.first,
));
await Future.delayed(Duration(milliseconds: 500));
scrollController.animateTo(
scrollController.position.maxScrollExtent,
duration: Duration(seconds: 1),
curve: Curves.easeInOut,
);
},
(error) {},
);

14
lib/features/level/presentation/ui/level_page.dart
View File

@ -22,11 +22,12 @@ class LevelPage extends StatelessWidget {
body: Stack(
children: [
SingleChildScrollView(
controller: context.read<LevelBloc>().scrollController,
child: Stack(
alignment: Alignment.center,
children: [
_background(),
_topPath(context),
// _topPath(context),
_bottomPath(context),
],
),
@ -47,7 +48,7 @@ class LevelPage extends StatelessWidget {
return Positioned(
bottom: MediaQuery
.viewPaddingOf(context)
.bottom,
.bottom + 10,
right: MySpaces.s16,
left: MySpaces.s16,
child: HintLevelWidget(
@ -107,7 +108,9 @@ class LevelPage extends StatelessWidget {
child: LevelWidget(
index: context.read<LevelBloc>().topLocationList[index].index ?? 0,
level: context.read<LevelBloc>().top12LevelList[index],
onTap: (LevelEntity level) => context.read<LevelBloc>().add(ChooseLevelEvent(level)),
onTap: (LevelEntity level) {
},
),
),
),
@ -139,7 +142,10 @@ class LevelPage extends StatelessWidget {
child: LevelWidget(
index: context.read<LevelBloc>().bottomLocationList[index].index ?? 0,
level: context.read<LevelBloc>().bottom8LevelList[index],
onTap: (LevelEntity level) => context.read<LevelBloc>().add(ChooseLevelEvent(level)),
type: index == 0 ? LevelType.current : LevelType.unFinished,
onTap: (LevelEntity level) {
},
),
),
),

6
lib/features/question/presentation/bloc/question_bloc.dart
View File

@ -3,6 +3,7 @@ import 'package:bloc/bloc.dart';
import 'package:flutter/cupertino.dart';
import 'package:hadi_hoda_flutter/core/params/question_params.dart';
import 'package:hadi_hoda_flutter/core/status/base_status.dart';
import 'package:hadi_hoda_flutter/features/question/domain/entity/answer_entity.dart';
import 'package:hadi_hoda_flutter/features/question/domain/usecases/get_level_usecase.dart';
import 'package:hadi_hoda_flutter/features/question/presentation/bloc/question_event.dart';
import 'package:hadi_hoda_flutter/features/question/presentation/bloc/question_state.dart';
@ -14,6 +15,7 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
this._getLevelUseCase,
) : super(const QuestionState()) {
on<GetLevelEvent>(_getLevelEvent);
on<ChooseAnswerEvent>(_chooseAnswerEvent);
}
/// ------------UseCases------------
@ -35,6 +37,10 @@ class QuestionBloc extends Bloc<QuestionEvent, QuestionState> {
ShowCaseWidget.of(context).startShowCase([keys[1]]);
}
FutureOr<void> _chooseAnswerEvent(ChooseAnswerEvent event, Emitter<QuestionState> emit) {
emit(state.copyWith(chooseAnswer: event.answer));
}
/// ------------Api Calls------------
FutureOr<void> _getLevelEvent(GetLevelEvent event, Emitter<QuestionState> emit) async {
await _getLevelUseCase(QuestionParams(id: int.parse(event.id ?? '0'))).then(

8
lib/features/question/presentation/bloc/question_event.dart
View File

@ -1,3 +1,5 @@
import 'package:hadi_hoda_flutter/features/question/domain/entity/answer_entity.dart';
sealed class QuestionEvent {
const QuestionEvent();
}
@ -7,3 +9,9 @@ class GetLevelEvent extends QuestionEvent {
const GetLevelEvent(this.id);
}
class ChooseAnswerEvent extends QuestionEvent {
final AnswerEntity? answer;
const ChooseAnswerEvent(this.answer);
}

9
lib/features/question/presentation/bloc/question_state.dart
View File

@ -1,22 +1,31 @@
import 'package:hadi_hoda_flutter/core/status/base_status.dart';
import 'package:hadi_hoda_flutter/features/level/domain/entity/level_entity.dart';
import 'package:hadi_hoda_flutter/features/question/domain/entity/answer_entity.dart';
class QuestionState {
final BaseStatus getQuestionStatus;
final LevelEntity? levelEntity;
final int currentStep;
final AnswerEntity? chooseAnswer;
const QuestionState({
this.getQuestionStatus = const BaseInit(),
this.levelEntity,
this.currentStep = 0,
this.chooseAnswer,
});
QuestionState copyWith({
BaseStatus? getQuestionStatus,
LevelEntity? levelEntity,
int? currentStep,
AnswerEntity? chooseAnswer,
}) {
return QuestionState(
getQuestionStatus: getQuestionStatus ?? this.getQuestionStatus,
levelEntity: levelEntity ?? this.levelEntity,
currentStep: currentStep ?? this.currentStep,
chooseAnswer: chooseAnswer ?? this.chooseAnswer,
);
}
}

103
lib/features/question/presentation/ui/question_page.dart
View File

@ -9,7 +9,10 @@ import 'package:hadi_hoda_flutter/core/utils/my_localization.dart';
import 'package:hadi_hoda_flutter/core/utils/screen_size.dart';
import 'package:hadi_hoda_flutter/core/widgets/answer_box/answer_box.dart';
import 'package:hadi_hoda_flutter/core/widgets/showcase/question_showcase.dart';
import 'package:hadi_hoda_flutter/features/question/domain/entity/answer_entity.dart';
import 'package:hadi_hoda_flutter/features/question/presentation/bloc/question_bloc.dart';
import 'package:hadi_hoda_flutter/features/question/presentation/bloc/question_event.dart';
import 'package:hadi_hoda_flutter/features/question/presentation/bloc/question_state.dart';
import 'package:hadi_hoda_flutter/features/question/presentation/ui/widgets/glassy_button.dart';
import 'package:hadi_hoda_flutter/features/question/presentation/ui/widgets/left_blob.dart';
import 'package:hadi_hoda_flutter/features/question/presentation/ui/widgets/question_stepper.dart';
@ -52,10 +55,10 @@ class QuestionPage extends StatelessWidget {
MySpaces.s4.gapHeight,
_topButtons(),
MySpaces.s10.gapHeight,
QuestionStepper(),
_stepper(),
_titles(),
MySpaces.s14.gapHeight,
_questions(),
_answers(),
_bottomDetail(context),
],
),
@ -67,18 +70,21 @@ class QuestionPage extends StatelessWidget {
);
}
Widget _topButtons() {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
GlassyButton(image: MyAssets.home, onTap: () {}),
Text(
'Toothbrushing etiquette',
style: GoogleFonts.marhey(
fontSize: 14,
fontWeight: FontWeight.w700,
color: Colors.white,
BlocBuilder<QuestionBloc, QuestionState>(
builder: (context, state) => Text(
state.levelEntity?.title ?? '',
style: GoogleFonts.marhey(
fontSize: 14,
fontWeight: FontWeight.w700,
color: Colors.white,
),
),
),
GlassyButton(image: MyAssets.music, onTap: () {}),
@ -86,46 +92,60 @@ class QuestionPage extends StatelessWidget {
);
}
Widget _stepper() {
return BlocBuilder<QuestionBloc, QuestionState>(
builder: (context, state) => QuestionStepper(
length: state.levelEntity?.questions?.length ?? 0,
currentStep: state.currentStep,
),
);
}
Column _titles() {
return Column(
spacing: MySpaces.s4,
children: [
Text(
'Question 1 / 5',
style: GoogleFonts.marhey(
fontSize: 12,
fontWeight: FontWeight.w500,
color: Colors.white.withValues(alpha: 0.5),
shadows: [
Shadow(
offset: Offset(0, 1),
blurRadius: 1,
color: Color(0xFF000000).withValues(alpha: 0.25),
),
],
BlocBuilder<QuestionBloc, QuestionState>(
builder: (context, state) => Text(
'Question ${state.currentStep} / ${state.levelEntity?.questions?.length ?? 0}',
style: GoogleFonts.marhey(
fontSize: 12,
fontWeight: FontWeight.w500,
color: Colors.white.withValues(alpha: 0.5),
shadows: [
Shadow(
offset: Offset(0, 1),
blurRadius: 1,
color: Color(0xFF000000).withValues(alpha: 0.25),
),
],
),
),
),
Text(
'Heda wants her teeth to be clean. Which of her actions do you think is correct?',
textAlign: TextAlign.center,
style: GoogleFonts.marhey(
fontSize: 22,
fontWeight: FontWeight.w600,
color: Colors.white,
shadows: [
Shadow(
offset: Offset(0, 1),
blurRadius: 1,
color: Color(0xFF000000).withValues(alpha: 0.25),
),
],
BlocBuilder<QuestionBloc, QuestionState>(
builder: (context, state) => Text(
state.levelEntity?.questions?[state.currentStep].title ?? '',
textAlign: TextAlign.center,
style: GoogleFonts.marhey(
fontSize: 22,
fontWeight: FontWeight.w600,
color: Colors.white,
shadows: [
Shadow(
offset: Offset(0, 1),
blurRadius: 1,
color: Color(0xFF000000).withValues(alpha: 0.25),
),
],
),
),
),
],
);
}
Expanded _questions() {
Expanded _answers() {
return Expanded(
child: GridView.builder(
itemCount: 4,
@ -137,7 +157,16 @@ class QuestionPage extends StatelessWidget {
itemBuilder: (context, index) => QuestionShowcase(
globalKey: context.read<QuestionBloc>().keys[index],
description: context.translate.tap_to_select,
child: AnswerBox(),
child: BlocBuilder<QuestionBloc, QuestionState>(
builder: (context, state) => AnswerBox(
index: index + 1,
answer: state.levelEntity?.questions?[state.currentStep]
.answers?[index] ?? AnswerEntity(),
selected: state.levelEntity?.questions?[state.currentStep]
.answers?[index].id == state.chooseAnswer?.id,
onTap: (answer) => context.read<QuestionBloc>().add(ChooseAnswerEvent(answer)),
),
),
),
),
);

17
lib/features/question/presentation/ui/widgets/question_stepper.dart
View File

@ -4,14 +4,17 @@ import 'package:hadi_hoda_flutter/common_ui/resources/my_assets.dart';
import 'package:hadi_hoda_flutter/core/utils/my_image.dart';
class QuestionStepper extends StatelessWidget {
const QuestionStepper({super.key});
const QuestionStepper({super.key, this.length = 0, this.currentStep = 0});
final int length;
final int currentStep;
@override
Widget build(BuildContext context) {
return SizedBox(
height: 80,
child: EasyStepper(
activeStep: 1,
activeStep: currentStep,
lineStyle: LineStyle(
lineLength: 20,
lineType: LineType.normal,
@ -29,9 +32,9 @@ class QuestionStepper extends StatelessWidget {
padding: EdgeInsets.all(0),
enableStepTapping: false,
steps: List.generate(
6,
length,
(index) => EasyStep(
customStep: index == 5
customStep: index == length - 1
? MyImage(image: MyAssets.diamond, size: 50)
: ClipPath(
clipper: _StepperClipper(),
@ -49,13 +52,13 @@ class QuestionStepper extends StatelessWidget {
padding: EdgeInsets.all(6),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: index < 1
color: index < currentStep
? Color(0XFF21B738)
: index == 1
: index == currentStep + 1
? Color(0XFF847AC4)
: Colors.transparent,
),
child: index < 1 ? MyImage(image: MyAssets.done) : null,
child: index < currentStep ? MyImage(image: MyAssets.done) : null,
),
),
),

2
lib/main.dart
View File

@ -1,5 +1,6 @@
import 'package:hadi_hoda_flutter/common_ui/theme/theme_service.dart';
import 'package:hadi_hoda_flutter/core/utils/local_storage.dart';
import 'package:hadi_hoda_flutter/core/utils/storage_path.dart';
import 'package:hadi_hoda_flutter/l10n/app_localizations.dart';
import 'package:hadi_hoda_flutter/init_bindings.dart';
import 'package:flutter/material.dart';
@ -14,6 +15,7 @@ Future<void> main() async {
await Future.wait([
LocalStorage.init(),
initDataBase(),
StoragePath.getApplicationDir(),
]);
AuthStorage.loadData();
runApp(const MainApp());

Write Preview
Loading…
Cancel
Save