added uv-index, cloudcover, dynamic_color

darkmoonight · Apr 16, 2023 · c0e865e · c0e865e
1 parent 16261dd
commit c0e865e
Show file tree

Hide file tree

Showing 13 changed files with 308 additions and 79 deletions.
diff --git a/assets/images/air_quality.png b/assets/images/air_quality.png
diff --git a/assets/images/cloudy.png b/assets/images/cloudy.png
diff --git a/assets/images/uv_index.png → assets/images/uv-index.png b/assets/images/uv_index.png → assets/images/uv-index.png
diff --git a/lib/app/api/api.dart b/lib/app/api/api.dart
@@ -73,7 +73,7 @@ class WeatherAPI {
 
   Future<Iterable<Result>> getSuggestions(String query, Locale? locale) async {
     final url =
-        'https://geocoding-api.open-meteo.com/v1/search?name=$query&count=10&language=${locale?.languageCode}&format=json';
+        'https://geocoding-api.open-meteo.com/v1/search?name=$query&count=5&language=${locale?.languageCode}&format=json';
     try {
       Response response = await dioLocation.get(url);
       if (response.statusCode == 200) {

diff --git a/lib/app/data/weather.dart b/lib/app/data/weather.dart
@@ -9,6 +9,7 @@ class Settings {
   bool? theme;
   bool location = false;
   bool notifications = false;
+  bool materialColor = false;
   String measurements = 'metric';
   String degrees = 'celsius';
   String timeformat = '24';

diff --git a/lib/app/data/weather.g.dart b/lib/app/data/weather.g.dart
diff --git a/lib/app/modules/settings.dart b/lib/app/modules/settings.dart
@@ -43,6 +43,23 @@ class _SettingsPageState extends State<SettingsPage> {
           ),
           // SettingLinks(
           //   icon: Icon(
+          //     Iconsax.colorfilter,
+          //     color: context.theme.iconTheme.color,
+          //   ),
+          //   text: 'materialColor'.tr,
+          //   switcher: true,
+          //   dropdown: false,
+          //   value: settings.materialColor,
+          //   onChange: (value) {
+          //     isar.writeTxn(() async {
+          //       settings.materialColor = value;
+          //       isar.settings.put(settings);
+          //     });
+          //     setState(() {});
+          //   },
+          // ),
+          // SettingLinks(
+          //   icon: Icon(
           //     Iconsax.notification,
           //     color: context.theme.iconTheme.color,
           //   ),

diff --git a/lib/app/modules/weather.dart b/lib/app/modules/weather.dart
@@ -268,11 +268,61 @@ class _WeatherPageState extends State<WeatherPage> {
                                 ),
                               ],
                             ),
+                            const SizedBox(height: 5),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                              children: [
+                                DescWeather(
+                                  imageName: 'assets/images/cloudy.png',
+                                  value:
+                                      '${locationController.mainWeather.cloudcover![locationController.hourOfDay.value]}%',
+                                  desc: 'cloudcover'.tr,
+                                ),
+                                DescWeather(
+                                  imageName: 'assets/images/uv-index.png',
+                                  value:
+                                      '${locationController.mainWeather.uvIndex![locationController.hourOfDay.value].round()}',
+                                  desc: 'uvIndex'.tr,
+                                  message: locationController
+                                              .mainWeather
+                                              .uvIndex![locationController
+                                                  .hourOfDay.value]
+                                              .round() <
+                                          3
+                                      ? 'uvLow'.tr
+                                      : locationController
+                                                  .mainWeather
+                                                  .uvIndex![locationController
+                                                      .hourOfDay.value]
+                                                  .round() <
+                                              6
+                                          ? 'uvAverage'.tr
+                                          : locationController
+                                                      .mainWeather
+                                                      .uvIndex![
+                                                          locationController
+                                                              .hourOfDay.value]
+                                                      .round() <
+                                                  8
+                                              ? 'uvHigh'.tr
+                                              : locationController
+                                                          .mainWeather
+                                                          .uvIndex![
+                                                              locationController
+                                                                  .hourOfDay
+                                                                  .value]
+                                                          .round() <
+                                                      11
+                                                  ? 'uvVeryHigh'.tr
+                                                  : 'uvExtreme'.tr,
+                                ),
+                              ],
+                            ),
                           ],
                         ),
                       )
                     : const MyShimmer(
-                        hight: 350,
+                        hight: 400,
                         edgeInsetsMargin: EdgeInsets.only(bottom: 15),
                       ),
               ),

diff --git a/lib/app/modules/weather_card.dart b/lib/app/modules/weather_card.dart
@@ -266,6 +266,40 @@ class _WeatherCardPageState extends State<WeatherCardPage> {
                           ),
                         ],
                       ),
+                      const SizedBox(height: 5),
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                        children: [
+                          DescWeather(
+                            imageName: 'assets/images/cloudy.png',
+                            value:
+                                '${widget.weatherCard.cloudcover![timeNow]}%',
+                            desc: 'cloudcover'.tr,
+                          ),
+                          DescWeather(
+                            imageName: 'assets/images/uv-index.png',
+                            value:
+                                '${widget.weatherCard.uvIndex![timeNow].round()}',
+                            desc: 'uvIndex'.tr,
+                            message: widget.weatherCard.uvIndex![timeNow]
+                                        .round() <
+                                    3
+                                ? 'uvLow'.tr
+                                : widget.weatherCard.uvIndex![timeNow].round() <
+                                        6
+                                    ? 'uvAverage'.tr
+                                    : widget.weatherCard.uvIndex![timeNow]
+                                                .round() <
+                                            8
+                                        ? 'uvHigh'.tr
+                                        : widget.weatherCard.uvIndex![timeNow]
+                                                    .round() <
+                                                11
+                                            ? 'uvVeryHigh'.tr
+                                            : 'uvExtreme'.tr,
+                          ),
+                        ],
+                      ),
                     ],
                   ),
                 ),