update

okok147 · Oct 6, 2019 · 3c15193 · 3c15193
1 parent 864da5d
commit 3c15193
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 6 deletions.
diff --git a/mobile_application_activity_04/lib/Pages/activity.dart b/mobile_application_activity_04/lib/Pages/activity.dart
@@ -290,6 +290,56 @@ class _ActivityState extends State<Activity> {
                     ),
                   ),
                   BarChartSample1(),
+                  Padding(
+                    padding: const EdgeInsets.fromLTRB(32, 0, 16, 16),
+                    child: FadeAnimation(
+                      5,
+                      Text(
+                        'Statistic',
+                        style: TextStyle(
+                          fontFamily: 'Arimo',
+                          fontWeight: FontWeight.w500,
+                          fontSize: 19,
+                        ),
+                      ),
+                    ),
+                  ),
+                  Row(
+                    children: <Widget>[
+                      FadeAnimation(
+                        6,
+                        Padding(
+                          padding: const EdgeInsets.fromLTRB(32, 5, 16, 8),
+                          child: ClipRRect(
+                            borderRadius: BorderRadius.circular(10),
+                            child: Container(
+                              height: 42,
+                              width: 42,
+                              color: Colors.blue.withOpacity(0.11),
+                              child: Center(
+                                child: Icon(
+                                  const IconData(0xe805,
+                                      fontFamily: 'CustomAppIcon'),
+                                  color: Colors.redAccent,
+                                ),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                      FadeAnimation(
+                        7,
+                        Text(
+                          '145 ccal burned',
+                          style: TextStyle(
+                            fontSize: 17,
+                            fontWeight: FontWeight.w100,
+                            color: Colors.black.withOpacity(0.75),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
                 ],
               ),
             ),

diff --git a/mobile_application_activity_04/lib/activity_time_bar_chart.dart b/mobile_application_activity_04/lib/activity_time_bar_chart.dart
@@ -59,15 +59,15 @@ class BarChartSample1State extends State<BarChartSample1> {
   @override
   Widget build(BuildContext context) {
     return AspectRatio(
-      aspectRatio: 1.3,
+      aspectRatio: 1.55,
       child: Card(
         elevation: 0,
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(18)),
         color: Colors.grey.withOpacity(0.02),
         child: Stack(
           children: <Widget>[
             Padding(
-              padding: const EdgeInsets.fromLTRB(32, 16, 32, 32),
+              padding: const EdgeInsets.fromLTRB(32, 8, 32, 20),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 mainAxisAlignment: MainAxisAlignment.start,
@@ -125,7 +125,7 @@ class BarChartSample1State extends State<BarChartSample1> {
                     ],
                   ),
                   const SizedBox(
-                    height: 25,
+                    height: 22,
                   ),
                   Expanded(
                     child: Padding(
@@ -137,9 +137,6 @@ class BarChartSample1State extends State<BarChartSample1> {
                       ),
                     ),
                   ),
-                  const SizedBox(
-                    height: 15,
-                  ),
                 ],
               ),
             ),

diff --git a/mobile_application_activity_04/process/day9.gif b/mobile_application_activity_04/process/day9.gif
diff --git a/mobile_application_activity_04/pubspec.yaml b/mobile_application_activity_04/pubspec.yaml
@@ -72,6 +72,9 @@ flutter:
     - family: Cabin
       fonts:
         - asset: assets/fonts/Cabin-Regular.ttf
+    - family: Arimo
+      fonts:
+        - asset: assets/fonts/Arimo-BoldItalic.ttf