Merge branch 'master' of http://github.com/masterashu/Heutagogy

Author: vitthal-inani

lib/lesson_3_tests.dart

@@ -2,6 +2,8 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:heutagogy/data_models.dart';
+import 'package:heutagogy/my_stepper.dart';
+import 'package:heutagogy/tests/star_rating.dart';
 import 'package:heutagogy/tests/test1.dart';
 import 'package:heutagogy/tests/test2.dart';
 import 'package:heutagogy/tests/test3.dart';
@@ -45,7 +47,13 @@ class Lesson1TestsState extends State<MyLesson3Tests> {
       isActive: true,
       state: StepState.indexed,
     ));
-
+    mySteps.add(Step(
+        title: Text(''),
+        content: StarTest(
+          "Put a bowl of water for birds everyday in your school and give yourself 3 stars.",
+          key: ObjectKey(1),
+        ),
+        isActive: true));
     for (int z = 0; z < maxLength; z++) {
       if (lessonData.test1 != null && z < lessonData.test1.length) {
         mySteps.add(Step(
@@ -104,14 +112,23 @@ class Lesson1TestsState extends State<MyLesson3Tests> {
         ));
       }
     }
+
+    mySteps.add(Step(
+        title: Text(''),
+        content: StarTest(
+          "Does the air and water have weight? Prove it and give yourself 3 stars.",
+          key: ObjectKey(2),
+        ),
+        isActive: true));
     mySteps.add(Step(
       title: Text(''),
       content:
           Test8Page([100, 200, 300, 400, 500, 600, 700, 800, 900, 1000], [200, 300, 600, 800, 900]),
       isActive: true,
       state: StepState.indexed,
     ));
-    mySteps.add(Step(title: Text(''), content: WellDonePage(), isActive: true, state: StepState.indexed));
+    mySteps.add(
+        Step(title: Text(''), content: WellDonePage(), isActive: true, state: StepState.indexed));
   }
 
   LessonData lessonData;
@@ -148,10 +165,10 @@ class Lesson1TestsState extends State<MyLesson3Tests> {
         data: ThemeData(
           canvasColor: Colors.white,
         ),
-        child: Stepper(
-          type: StepperType.horizontal,
-          currentStep: this.currentStep,
-          onStepTapped: onStepTapped,
+        child: MyStepper(
+          type: MyStepperType.horizontal,
+          currentMyStep: this.currentStep,
+          onMyStepTapped: onStepTapped,
           steps: mySteps,
           controlsBuilder: (BuildContext context,
               {VoidCallback onStepContinue, VoidCallback onStepCancel}) {

lib/summative_assesment.dart

@@ -41,10 +41,15 @@ class Lesson1TestsState extends State<SummativeTests> {
     List<String> subjects = ["english", "maths", "evs", "telegu", "biology"];
 
     for (String sub in subjects) {
+      mySteps.add(
+        Step(
+          content: TransitionPage(subject: sub),
+          isActive: true,
+          title: Text(sub.toUpperCase()),
+          state: StepState.indexed,
+        ),
+      );
 
-      mySteps.add(Step(
-          title: Text(''),
-          content:TransitionPage(subject: sub),isActive: true));
       if (sub == "maths") {
         mySteps.add(Step(
           title: Text(''),
@@ -169,11 +174,8 @@ class Lesson1TestsState extends State<SummativeTests> {
       }
     }
 
-    mySteps.add(Step(
-        title: Text(''),
-        content: WellDonePage(),
-        isActive: true,
-        state: StepState.indexed));
+    mySteps.add(
+        Step(title: Text(''), content: WellDonePage(), isActive: true, state: StepState.indexed));
   }
 
   LessonData lessonData;
@@ -245,8 +247,11 @@ class Lesson1TestsState extends State<SummativeTests> {
                   child: Padding(
                     padding: EdgeInsets.fromLTRB(0, 0, 20, 0),
                     child: FloatingActionButton.extended(
-                      backgroundColor: Colors.white,
-                      splashColor: Colors.lightBlueAccent,
+                      backgroundColor:
+                          (currentStep == mySteps.length - 1) ? Colors.blueAccent : Colors.white,
+                      splashColor: (currentStep == mySteps.length - 1)
+                          ? Colors.white54
+                          : Colors.lightBlueAccent,
                       heroTag: 'NextStep',
                       onPressed: () {
                         if (currentStep < mySteps.length - 1) {
@@ -258,19 +263,21 @@ class Lesson1TestsState extends State<SummativeTests> {
                         }
                       },
                       label: Text(
-                        "Next",
+                        (currentStep == mySteps.length - 1) ? "Finish" : "Next",
                         style: TextStyle(
-                            color: Colors.blue,
+                            color: (currentStep == mySteps.length - 1) ? Colors.white : Colors.blue,
                             fontSize: 16,
                             fontWeight: FontWeight.bold),
                       ),
                       shape: RoundedRectangleBorder(
                           side: BorderSide(color: Colors.blue, width: 1),
                           borderRadius: BorderRadius.circular(40)),
-                      icon: Icon(
-                        Icons.navigate_next,
-                        color: Colors.blue,
-                      ),
+                      icon: (currentStep == mySteps.length - 1)
+                          ? null
+                          : Icon(
+                              Icons.navigate_next,
+                              color: Colors.blue,
+                            ),
                     ),
                   ),
                 ),
@@ -291,8 +298,7 @@ class Lesson1TestsState extends State<SummativeTests> {
                           Navigator.pop(context);
                         }
                       },
-                      shape: CircleBorder(
-                          side: BorderSide(color: Colors.blue, width: 1)),
+                      shape: CircleBorder(side: BorderSide(color: Colors.blue, width: 1)),
                       child: Icon(
                         Icons.arrow_back,
                         color: Colors.blue,

lib/tests/star_rating.dart

@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+import 'package:smooth_star_rating/smooth_star_rating.dart';
+
+class StarTest extends StatefulWidget {
+  final String heading;
+
+  StarTest(this.heading, {Key key}) : super(key: key);
+
+  @override
+  _StarTestState createState() => _StarTestState(heading);
+}
+
+class _StarTestState extends State<StarTest> {
+  String heading;
+  double rating;
+
+  _StarTestState(this.heading);
+
+  @override
+  void initState() {
+    super.initState();
+    rating = 0;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: <Widget>[
+          Padding(
+            child: Center(
+              child: Text(
+                heading,
+                style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20),
+              ),
+            ),
+            padding: EdgeInsets.only(top: 10, bottom: 20),
+          ),
+          SmoothStarRating(
+              allowHalfRating: false,
+              onRatingChanged: (v) {
+                rating = v;
+                setState(() {});
+              },
+              starCount: 3,
+              rating: rating,
+              size: 40.0,
+              color: Colors.green,
+              borderColor: Colors.green,
+              spacing: 0.0)
+        ],
+      ),
+    );
+  }
+}

pubspec.lock

@@ -205,6 +205,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.99"
+  smooth_star_rating:
+    dependency: "direct main"
+    description:
+      name: smooth_star_rating
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.3"
   source_span:
     dependency: transitive
     description:

pubspec.yaml

@@ -30,6 +30,7 @@ dependencies:
   path_provider: ^1.4.4
   cached_network_image: ^1.1.3
   youtube_player: ^3.5.0
+  smooth_star_rating: 1.0.3