Fix tiles border on long press

RitamChakraborty · Oct 13, 2020 · 0fd227b · 0fd227b
1 parent bb0ee1d
commit 0fd227b
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 42 deletions.
diff --git a/lib/data/constants.dart b/lib/data/constants.dart
@@ -1,7 +1,11 @@
+import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
 const String GLOBAL_API = "https://disease.sh/v3/covid-19/all";
 const String CONTINENT_API = "https://disease.sh/v3/covid-19/continents";
 const String COUNTRY_API = "https://disease.sh/v3/covid-19/countries";
 
 final NumberFormat NUMBER_FORMAT = NumberFormat.compact(locale: "en_us");
+final ShapeBorder SHAPE = RoundedRectangleBorder(
+  borderRadius: BorderRadius.circular(10),
+);
diff --git a/lib/providers/service_provider.dart b/lib/providers/service_provider.dart
@@ -11,29 +11,29 @@ class ServiceProvider extends ChangeNotifier {
   List<Country> _countries;
 
   Global get global {
-    _global = Global.fromMap(map: {
-      "updated": 1601909792858,
-      "cases": 35483998,
-      "todayCases": 93887,
-      "deaths": 1043087,
-      "todayDeaths": 1538,
-      "recovered": 26694334,
-      "todayRecovered": 79500,
-      "active": 7746577,
-      "critical": 66550,
-      "casesPerOneMillion": 4552,
-      "deathsPerOneMillion": 133.8,
-      "tests": 671031644,
-      "testsPerOneMillion": 86266.67,
-      "population": 7778573974,
-      "oneCasePerPeople": 0,
-      "oneDeathPerPeople": 0,
-      "oneTestPerPeople": 0,
-      "activePerOneMillion": 995.89,
-      "recoveredPerOneMillion": 3431.78,
-      "criticalPerOneMillion": 8.56,
-      "affectedCountries": 216
-    });
+    // _global = Global.fromMap(map: {
+    //   "updated": 1601909792858,
+    //   "cases": 35483998,
+    //   "todayCases": 93887,
+    //   "deaths": 1043087,
+    //   "todayDeaths": 1538,
+    //   "recovered": 26694334,
+    //   "todayRecovered": 79500,
+    //   "active": 7746577,
+    //   "critical": 66550,
+    //   "casesPerOneMillion": 4552,
+    //   "deathsPerOneMillion": 133.8,
+    //   "tests": 671031644,
+    //   "testsPerOneMillion": 86266.67,
+    //   "population": 7778573974,
+    //   "oneCasePerPeople": 0,
+    //   "oneDeathPerPeople": 0,
+    //   "oneTestPerPeople": 0,
+    //   "activePerOneMillion": 995.89,
+    //   "recoveredPerOneMillion": 3431.78,
+    //   "criticalPerOneMillion": 8.56,
+    //   "affectedCountries": 216
+    // });
 
     if (_global == null) {
       _httpService.fetchGlobalData().then((Global global) {

diff --git a/lib/widgets/continent_tile.dart b/lib/widgets/continent_tile.dart
@@ -1,3 +1,4 @@
+import 'package:coronatracker/data/constants.dart';
 import 'package:coronatracker/models/continent.dart';
 import 'package:coronatracker/pages/continent_page.dart';
 import 'package:flutter/material.dart';
@@ -18,10 +19,9 @@ class ContinentTile extends StatelessWidget {
       margin: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 16.0),
       child: Card(
         elevation: 10.0,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(10),
-        ),
+        shape: SHAPE,
         child: MaterialButton(
+          shape: SHAPE,
           onPressed: () {
             Navigator.push(
               context,

diff --git a/lib/widgets/country_tile.dart b/lib/widgets/country_tile.dart
@@ -1,3 +1,4 @@
+import 'package:coronatracker/data/constants.dart';
 import 'package:coronatracker/data/sorting.dart';
 import 'package:coronatracker/models/country.dart';
 import 'package:coronatracker/pages/country_page.dart';
@@ -42,10 +43,9 @@ class CountryTile extends StatelessWidget {
       margin: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 16.0),
       child: Card(
         elevation: 10.0,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(10),
-        ),
+        shape: SHAPE,
         child: MaterialButton(
+          shape: SHAPE,
           onPressed: () {
             Navigator.push(
               context,
@@ -58,16 +58,6 @@ class CountryTile extends StatelessWidget {
             );
           },
           child: ListTile(
-            trailing: SizedBox(
-              height: 50,
-              width: 50,
-              child: ClipRRect(
-                borderRadius: BorderRadius.circular(50),
-                child: HeroFlag(
-                  country: _country,
-                ),
-              ),
-            ),
             title: Text(
               _country.country,
               style: TextStyle(fontSize: 20.0),
@@ -80,6 +70,16 @@ class CountryTile extends StatelessWidget {
                 ],
               ),
             ),
+            trailing: SizedBox(
+              height: 50,
+              width: 50,
+              child: ClipRRect(
+                borderRadius: BorderRadius.circular(50),
+                child: HeroFlag(
+                  country: _country,
+                ),
+              ),
+            ),
             leading: _index == null
                 ? null
                 : Text(

diff --git a/lib/widgets/tile_demo.dart b/lib/widgets/tile_demo.dart
@@ -1,3 +1,4 @@
+import 'package:coronatracker/data/constants.dart';
 import 'package:coronatracker/widgets/text_demo.dart';
 import 'package:flutter/material.dart';
 
@@ -15,10 +16,9 @@ class TileDemo extends StatelessWidget {
       margin: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 16.0),
       child: Card(
         elevation: 10.0,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(10),
-        ),
+        shape: SHAPE,
         child: MaterialButton(
+          shape: SHAPE,
           onPressed: null,
           child: ListTile(
             title: TextDemo(