Flutter 2.5.3

gumbarros · Dec 27, 2021 · 0349914 · 0349914
1 parent c47fe06
commit 0349914
Show file tree

Hide file tree

Showing 18 changed files with 162 additions and 212 deletions.
diff --git a/README.md b/README.md
@@ -5,14 +5,11 @@
 
 # How to contribute 💻
 - Developing the charts (largest planets, longest orbits)
-- Refactoring the code to better performance and UI
+- Refactoring the code
 - Translating the app 
 
 > The only requirements to contribute are to speak English and know Flutter.
-> You can join our discord server by PM-ing RonanHansel#0059 or Gustavo Mauricio#1914
-
-## [Kepler API](https://www.github.com/ronanhansel/kepler-api) 🪐
-> Also see the API to convert the .csv from NASA to .json for our app
+> You can join our discord server [here](https://discord.gg/MM8VFh3j)
 
 ## Data & TAP Credits - [NASA Exoplanet Archive](https://exoplanetarchive.ipac.caltech.edu/) 🚀
 

diff --git a/lib/src/controllers/mars/mars_controller.dart b/lib/src/controllers/mars/mars_controller.dart
@@ -1,12 +1,11 @@
-import 'package:brasil_fields/brasil_fields.dart';
+import 'package:date_format/date_format.dart' as format;
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:kepler/src/models/enums/mars_date.dart';
 import 'package:kepler/src/models/mars_data.dart';
 import 'package:kepler/src/models/rover_data.dart';
 import 'package:kepler/src/services/api/api.dart';
 import 'package:platform_date_picker/platform_date_picker.dart';
-import 'package:date_format/date_format.dart' as format;
 
 class MarsController extends GetxController {
   static MarsController get to => Get.find();
@@ -30,7 +29,8 @@ class MarsController extends GetxController {
       earthDate.value.text = format
           .formatDate(date, [format.mm, '/', format.dd, '/', format.yyyy]);
     } else {
-      earthDate.value.text = UtilData.obterDataDDMMAAAA(date).toString();
+      earthDate.value.text = format
+          .formatDate(date, [format.dd, '/', format.mm, '/', format.yyyy]);
     }
 
     apiDate.value = format

diff --git a/lib/src/controllers/settings/settings_controller.dart b/lib/src/controllers/settings/settings_controller.dart
@@ -1,9 +1,7 @@
-import 'package:extended_image/extended_image.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:kepler/src/controllers/home/home_controller.dart';
-import 'package:kepler/src/services/api/api.dart';
 import 'package:kepler/src/services/database/database.dart';
 import 'package:kepler/src/ui/widgets/dialogs/sync_dialog.dart';
 import 'package:kepler/src/ui/widgets/snackbars/snackbars.dart';
@@ -39,11 +37,6 @@ class SettingsController extends GetxController {
 
       Snackbars.snackbar(text: "this_may_take_some_time".tr, title: "updating_data".tr);
 
-      KeplerUtils.syncUpdate("caching_nasa".tr, 0.1);
-      final cacheDailyImage = await API.getImageOfTheDay();
-
-      new ExtendedImage.network(cacheDailyImage.url);
-
       success.value = await KeplerDatabase.db.updateData().then((success) {
         KeplerUtils.syncUpdate("finished".tr, 1);
         Get.back();

diff --git a/lib/src/models/rover_data.dart b/lib/src/models/rover_data.dart
@@ -21,7 +21,7 @@ class RoverData {
     maxDate = DateTime.parse(json['max_date']);
     totalPhotos = json['total_photos'];
     if (json['cameras'] != null) {
-      cameras = new List<CameraData>();
+      cameras = <CameraData>[];
       json['cameras'].forEach((v) {
         cameras.add(new CameraData.fromJson(v));
       });

diff --git a/lib/src/services/api/api.dart b/lib/src/services/api/api.dart
@@ -1,13 +1,14 @@
+import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 import 'package:json_async/json_async.dart';
-import 'package:get/get.dart';
 import 'package:kepler/src/models/daily_image_data.dart';
 import 'package:kepler/src/models/mars_data.dart';
 import 'package:kepler/src/models/rover_data.dart';
 import 'package:kepler/src/utils/kepler_utils.dart';
 
 class API {
-  static const String url = "https://kepler-api-1.herokuapp.com/";
+  static const String url =
+      "https://exoplanetarchive.ipac.caltech.edu/TAP/sync?query=select+pl_name,hostname,disc_year,pl_orbper,pl_bmassj,pl_radj,pl_dens,st_teff,st_rad,st_mass,st_age,sy_bmag,sy_vmag+from+pscomppars+where+pl_controv_flag=0&format=json";
   static const String dailyUrl =
       "https://api.nasa.gov/planetary/apod?api_key=nrXAZMcugA46nocWFcJrgKkDV65dxpYWX1NDoFjj";
   static const String marsUrl = "https://mars-photos.herokuapp.com/api/v1";
@@ -56,14 +57,13 @@ class API {
     final Map res = await jsonDecodeAsyncMap(response.body);
     final List data = res.values.first;
     final List<RoverData> rovers =
-        data.map((e) => new RoverData.fromMap(e)).toList();
+    data.map((e) => new RoverData.fromMap(e)).toList();
     return rovers;
   }
 
-  static Future<List<MarsData>> getLatestMarsImages(
-      String rover, int page) async {
+  static Future<List<MarsData>> getLatestMarsImages(String rover, int page) async {
     final http.Response response =
-        await http.get(marsUrl + '/rovers/$rover/latest_photos?page=$page');
+    await http.get(marsUrl + '/rovers/$rover/latest_photos?page=$page');
     print("HTTP GET - " + marsUrl + '/rovers/$rover/latest_photos?page=$page');
     final Map res = await jsonDecodeAsyncMap(response.body);
     final List data = res.values.first;
@@ -73,8 +73,7 @@ class API {
     return mars;
   }
 
-  static Future<List<MarsData>> getMarsImagesBySol(
-      String rover, int page, String sol) async {
+  static Future<List<MarsData>> getMarsImagesBySol(String rover, int page, String sol) async {
     final http.Response response = await http
         .get(marsUrl + '/rovers/$rover/photos?page=$page&sol=$sol');
     print("HTTP GET - " + marsUrl + '/rovers/$rover/photos??page=$page&sol=$sol');
@@ -86,8 +85,7 @@ class API {
     return mars;
   }
 
-  static Future<List<MarsData>> getMarsImagesByEarthDate(
-      String rover, int page, String date) async {
+  static Future<List<MarsData>> getMarsImagesByEarthDate(String rover, int page, String date) async {
     final http.Response response = await http.get(
         marsUrl + '/rovers/$rover/photos?page=$page&earth_date=$date');
     print("HTTP GET - " + marsUrl +'/rovers/$rover/photos?page=$page&earth_date=$date');

diff --git a/lib/src/services/database/database.dart b/lib/src/services/database/database.dart
@@ -1,9 +1,10 @@
 import 'dart:async';
-import 'package:get/get.dart';
+
 import 'package:flutter/foundation.dart';
+import 'package:get/get.dart';
 import 'package:kepler/src/models/planet_data.dart';
-import 'package:kepler/src/services/api/api.dart';
 import 'package:kepler/src/models/star_data.dart';
+import 'package:kepler/src/services/api/api.dart';
 import 'package:kepler/src/utils/kepler_utils.dart';
 import 'package:path/path.dart';
 import 'package:sqflite/sqflite.dart';
@@ -195,9 +196,7 @@ class KeplerDatabase {
     final planets = data
         .map((Map<String, dynamic> planet) => PlanetData.fromMap(planet))
         .toList();
-    // planets.forEach((PlanetData planet) {
-    //   if(planet)
-    // });
+
     return planets;
   }
 

diff --git a/lib/src/ui/views/dailyImage/daily_image_view.dart b/lib/src/ui/views/dailyImage/daily_image_view.dart
@@ -1,4 +1,3 @@
-import 'package:extended_image/extended_image.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
@@ -21,7 +20,7 @@ class DailyImageView extends StatelessWidget {
             Background(),
             Scaffold(
               backgroundColor: Colors.transparent,
-              resizeToAvoidBottomPadding: false,
+              resizeToAvoidBottomInset: false,
               body: FutureBuilder<DailyImageData>(
                   future: _.getImageOfTheDay(),
                   builder: (BuildContext context,
@@ -58,7 +57,7 @@ class DailyImageView extends StatelessWidget {
                                       bottomLeft: Radius.circular(20),
                                       bottomRight: Radius.circular(20),
                                     ),
-                                    child: ExtendedImage.network(snapshot.data.hdurl,)),
+                                    child: Image.network(snapshot.data.hdurl)),
                                 title: Text(snapshot.data.title),
                                 stretchModes: [
                                   StretchMode.fadeTitle,

diff --git a/lib/src/ui/views/explore/planets_view.dart b/lib/src/ui/views/explore/planets_view.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:get/state_manager.dart';
-import 'package:kepler/src/controllers/favorites/favorites_controller.dart';
 import 'package:kepler/src/controllers/explore/planet_controller.dart';
+import 'package:kepler/src/controllers/favorites/favorites_controller.dart';
 import 'package:kepler/src/models/planet_data.dart';
 import 'package:kepler/src/ui/theme.dart';
 import 'package:kepler/src/ui/widgets/backgrounds/background.dart';
@@ -23,7 +23,7 @@ class PlanetView extends StatelessWidget {
             Background(),
             Scaffold(
               backgroundColor: Colors.transparent,
-                  resizeToAvoidBottomPadding: false,
+                  resizeToAvoidBottomInset: false,
                   body: ListView(
                     physics: BouncingScrollPhysics(),
                     children: [

diff --git a/lib/src/ui/views/explore/solar_system_view.dart b/lib/src/ui/views/explore/solar_system_view.dart
@@ -2,20 +2,20 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
 import 'package:get/route_manager.dart';
-import 'package:kepler/src/controllers/favorites/favorites_controller.dart';
 import 'package:kepler/src/controllers/explore/planet_controller.dart';
 import 'package:kepler/src/controllers/explore/solar_system_controller.dart';
+import 'package:kepler/src/controllers/favorites/favorites_controller.dart';
+import 'package:kepler/src/models/planet_data.dart';
 import 'package:kepler/src/models/star_data.dart';
 import 'package:kepler/src/services/database/database.dart';
-import 'package:kepler/src/models/planet_data.dart';
 import 'package:kepler/src/ui/theme.dart';
 import 'package:kepler/src/ui/widgets/backgrounds/background.dart';
 import 'package:kepler/src/ui/widgets/cards/planet_card.dart';
 import 'package:kepler/src/ui/widgets/header/header.dart';
+import 'package:kepler/src/ui/widgets/progress/loading.dart';
 import 'package:kepler/src/ui/widgets/universe/gas_planet.dart';
 import 'package:kepler/src/ui/widgets/universe/small_planet.dart';
 import 'package:kepler/src/ui/widgets/universe/star.dart';
-import 'package:kepler/src/ui/widgets/progress/loading.dart';
 
 class SolarSystemView extends StatelessWidget {
 
@@ -56,15 +56,20 @@ class SolarSystemView extends StatelessWidget {
             Background(),
             Scaffold(
               backgroundColor: Colors.transparent,
-              resizeToAvoidBottomPadding: false,
+              resizeToAvoidBottomInset: false,
               body: ListView(
                 physics: BouncingScrollPhysics(),
                 children: [
                   Column(
                     children: [
                       Container(
                         color: Colors.transparent,
-                        child: Header(Get.locale == Locale("pt") /*Add your language here if system sounds strange with the star name*/? star.name :  star.name + "system".tr,
+                        child: Header(
+                            Get.locale ==
+                                    Locale(
+                                        "pt") /*Add your language here if system sounds strange with the star name*/
+                                ? star.name
+                                : star.name + "system".tr,
                             () => Get.back(canPop: true)),
                       ),
                       Padding(

diff --git a/lib/src/ui/views/explore/stars_view.dart b/lib/src/ui/views/explore/stars_view.dart
@@ -4,13 +4,12 @@ import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
 import 'package:get/route_manager.dart';
 import 'package:kepler/src/controllers/explore/stars_controller.dart';
-import 'package:kepler/src/services/database/database.dart';
 import 'package:kepler/src/models/star_data.dart';
+import 'package:kepler/src/services/database/database.dart';
 import 'package:kepler/src/ui/theme.dart';
 import 'package:kepler/src/ui/widgets/backgrounds/background.dart';
 import 'package:kepler/src/ui/widgets/cards/star_card.dart';
 import 'package:kepler/src/ui/widgets/dialogs/filter_dialog.dart';
-
 import 'package:kepler/src/ui/widgets/forms/search_bar.dart';
 import 'package:kepler/src/ui/widgets/header/header.dart';
 import 'package:kepler/src/ui/widgets/progress/loading.dart';
@@ -47,7 +46,7 @@ class StarsView extends StatelessWidget {
           Background(),
           Scaffold(
             backgroundColor: Colors.transparent,
-            resizeToAvoidBottomPadding: false,
+            resizeToAvoidBottomInset: false,
             body: Stack(children: [
               Container(
                 width: Get.width,

diff --git a/lib/src/ui/views/favorites/favorites_view.dart b/lib/src/ui/views/favorites/favorites_view.dart
@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
 import 'package:get/route_manager.dart';
-import 'package:kepler/src/controllers/favorites/favorites_controller.dart';
 import 'package:kepler/src/controllers/explore/planet_controller.dart';
 import 'package:kepler/src/controllers/explore/stars_controller.dart';
+import 'package:kepler/src/controllers/favorites/favorites_controller.dart';
 import 'package:kepler/src/models/planet_data.dart';
 import 'package:kepler/src/ui/widgets/backgrounds/background.dart';
 import 'package:kepler/src/ui/widgets/cards/planet_card.dart';
@@ -53,15 +53,17 @@ class FavoritesView extends StatelessWidget{
           Background(),
           Scaffold(
             backgroundColor: Colors.transparent,
-            resizeToAvoidBottomPadding: false,
+            resizeToAvoidBottomInset: false,
             body: ListView(
               physics: BouncingScrollPhysics(),
               children: [
                 Column(
                   children: [
                     Container(
-                      child: Header("favourites".tr, () => Get.back(canPop: true),
-                    ),
+                      child: Header(
+                        "favourites".tr,
+                        () => Get.back(canPop: true),
+                      ),
                     )
                   ],
                 ),

diff --git a/lib/src/ui/views/mars/mars_rover_view.dart b/lib/src/ui/views/mars/mars_rover_view.dart
@@ -21,12 +21,12 @@ class MarsRoversView extends StatelessWidget {
         Background(),
         Scaffold(
             backgroundColor: Colors.transparent,
-            resizeToAvoidBottomPadding: false,
+            resizeToAvoidBottomInset: false,
             body: Stack(
               children: [
                 Container(
                     color: Colors.transparent,
-                    child: Header("rovers".tr, (){
+                    child: Header("rovers".tr, () {
                       Get.toNamed('/home');
                     })),
                 FutureBuilder(

diff --git a/lib/src/ui/views/mars/mars_view.dart b/lib/src/ui/views/mars/mars_view.dart
@@ -43,7 +43,7 @@ class MarsView extends StatelessWidget {
                 ],
               ),
               backgroundColor: Colors.transparent,
-              resizeToAvoidBottomPadding: false,
+              resizeToAvoidBottomInset: false,
               body: FutureBuilder<List<MarsData>>(
                   future: _.getMarsData(rover.name, _.page),
                   builder: (BuildContext context,

diff --git a/lib/src/ui/widgets/dialogs/filter_dialog.dart b/lib/src/ui/widgets/dialogs/filter_dialog.dart
@@ -2,8 +2,8 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:kepler/src/controllers/explore/stars_controller.dart';
-import 'package:kepler/src/utils/kepler_utils.dart';
 import 'package:kepler/src/ui/widgets/forms/text_field.dart';
+import 'package:kepler/src/utils/kepler_utils.dart';
 
 class FilterDialog extends StatelessWidget {
   @override
@@ -113,24 +113,31 @@ class FilterDialog extends StatelessWidget {
                               _.update();
                             },)),
                             Text("to".tr),
-                            Container(width: Get.width / 4, child: KeplerTextField(initialValue: _.radiusTo,textAlign: TextAlign.center,numeral: true,onChanged: (value){
-                              _.radiusTo = value;
-                              _.update();
-                            },)),
-
+                                Container(
+                                    width: Get.width / 4,
+                                    child: KeplerTextField(
+                                      initialValue: _.radiusTo,
+                                      textAlign: TextAlign.center,
+                                      numeral: true,
+                                      onChanged: (value) {
+                                        _.radiusTo = value;
+                                        _.update();
+                                      },
+                                    )),
+                              ],
+                            ),
                           ],
-                        ),
-                      ],)
-                  ],)
-                ),
-                RaisedButton(
-                  color: Theme.of(context).primaryColor,
+                        )
+                      ],
+                    )),
+                TextButton(
+                  style: TextButton.styleFrom(
+                      backgroundColor: Get.theme.primaryColor),
                   child: Text('filter'.tr),
                   onPressed: () {
                     Get.back();
                   },
                 ),
-
               ],
             ),
           )),