From 014a52c2156b6472ef0587648fa2d69c2d18bc94 Mon Sep 17 00:00:00 2001 From: Yoshi Date: Fri, 6 Sep 2024 22:07:50 +0300 Subject: [PATCH] Rename folders --- lib/app/api/api.dart | 2 +- lib/app/controller/controller.dart | 10 +++--- lib/app/data/{weather.dart => db.dart} | 2 +- lib/app/data/{weather.g.dart => db.g.dart} | 2 +- lib/app/{modules => ui}/geolocation.dart | 6 ++-- lib/app/{modules => ui}/home.dart | 25 +++++++-------- .../main/view/main.dart} | 32 +++++++++---------- lib/app/{modules => ui}/map/view/map.dart | 28 ++++++++-------- lib/app/{modules => ui}/onboarding.dart | 6 ++-- .../places/view/place_info.dart} | 30 ++++++++--------- .../places/view/place_list.dart} | 14 ++++---- .../places/widgets/create_place.dart} | 12 +++---- .../places/widgets/place_card.dart} | 12 +++---- .../places/widgets/place_card_list.dart} | 16 +++++----- .../settings/view/settings.dart | 8 ++--- .../settings/widgets/setting_card.dart | 0 lib/app/{ => ui}/widgets/button.dart | 0 lib/app/{ => ui}/widgets/shimmer.dart | 0 lib/app/{ => ui}/widgets/text_form.dart | 0 .../widgets/weather/daily/daily_card.dart} | 12 +++---- .../weather/daily/daily_card_info.dart} | 28 ++++++++-------- .../weather/daily/daily_card_list.dart} | 18 +++++------ .../weather/daily/daily_container.dart} | 18 +++++------ .../widgets/weather}/desc/desc.dart | 0 .../widgets/weather}/desc/desc_container.dart | 6 ++-- .../widgets/weather}/desc/message.dart | 0 .../widgets/weather/hourly.dart} | 12 +++---- .../widgets/weather/now.dart} | 12 +++---- .../widgets/weather}/status/status_data.dart | 0 .../weather}/status/status_weather.dart | 0 .../widgets/weather}/sunset_sunrise.dart | 2 +- lib/{ => app}/utils/color_converter.dart | 0 lib/{ => app}/utils/device_info.dart | 0 lib/app/{services => utils}/notification.dart | 0 .../utils.dart => utils/show_snack_bar.dart} | 0 lib/main.dart | 10 +++--- lib/theme/theme_controller.dart | 2 +- pubspec.lock | 14 ++++---- pubspec.yaml | 6 ++-- 39 files changed, 172 insertions(+), 173 deletions(-) rename lib/app/data/{weather.dart => db.dart} (99%) rename lib/app/data/{weather.g.dart => db.g.dart} (99%) rename lib/app/{modules => ui}/geolocation.dart (99%) rename lib/app/{modules => ui}/home.dart (93%) rename lib/app/{modules/main/view/weather_main.dart => ui/main/view/main.dart} (89%) rename lib/app/{modules => ui}/map/view/map.dart (95%) rename lib/app/{modules => ui}/onboarding.dart (97%) rename lib/app/{modules/cards/view/info_weather_card.dart => ui/places/view/place_info.dart} (90%) rename lib/app/{modules/cards/view/list_weather_card.dart => ui/places/view/place_list.dart} (88%) rename lib/app/{modules/cards/widgets/create_card_weather.dart => ui/places/widgets/create_place.dart} (97%) rename lib/app/{modules/cards/widgets/weather_card_container.dart => ui/places/widgets/place_card.dart} (92%) rename lib/app/{modules/cards/widgets/weather_card_list.dart => ui/places/widgets/place_card_list.dart} (89%) rename lib/app/{modules => ui}/settings/view/settings.dart (99%) rename lib/app/{modules => ui}/settings/widgets/setting_card.dart (100%) rename lib/app/{ => ui}/widgets/button.dart (100%) rename lib/app/{ => ui}/widgets/shimmer.dart (100%) rename lib/app/{ => ui}/widgets/text_form.dart (100%) rename lib/app/{widgets/daily/list_daily_card.dart => ui/widgets/weather/daily/daily_card.dart} (89%) rename lib/app/{widgets/daily/info_daily_card.dart => ui/widgets/weather/daily/daily_card_info.dart} (92%) rename lib/app/{widgets/daily/weather_more.dart => ui/widgets/weather/daily/daily_card_list.dart} (79%) rename lib/app/{widgets/daily/weather_daily.dart => ui/widgets/weather/daily/daily_container.dart} (90%) rename lib/app/{widgets => ui/widgets/weather}/desc/desc.dart (100%) rename lib/app/{widgets => ui/widgets/weather}/desc/desc_container.dart (98%) rename lib/app/{widgets => ui/widgets/weather}/desc/message.dart (100%) rename lib/app/{widgets/hourly/weather_hourly.dart => ui/widgets/weather/hourly.dart} (83%) rename lib/app/{widgets/now/weather_now.dart => ui/widgets/weather/now.dart} (94%) rename lib/app/{widgets => ui/widgets/weather}/status/status_data.dart (100%) rename lib/app/{widgets => ui/widgets/weather}/status/status_weather.dart (100%) rename lib/app/{widgets/sun_moon => ui/widgets/weather}/sunset_sunrise.dart (97%) rename lib/{ => app}/utils/color_converter.dart (100%) rename lib/{ => app}/utils/device_info.dart (100%) rename lib/app/{services => utils}/notification.dart (100%) rename lib/app/{services/utils.dart => utils/show_snack_bar.dart} (100%) diff --git a/lib/app/api/api.dart b/lib/app/api/api.dart index 2a30802..eccd99a 100644 --- a/lib/app/api/api.dart +++ b/lib/app/api/api.dart @@ -3,7 +3,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:rain/app/api/city_api.dart'; import 'package:rain/app/api/weather_api.dart'; -import 'package:rain/app/data/weather.dart'; +import 'package:rain/app/data/db.dart'; import 'package:rain/main.dart'; class WeatherAPI { diff --git a/lib/app/controller/controller.dart b/lib/app/controller/controller.dart index 1e01069..b4e6adf 100644 --- a/lib/app/controller/controller.dart +++ b/lib/app/controller/controller.dart @@ -11,11 +11,11 @@ import 'package:isar/isar.dart'; import 'package:lat_lng_to_timezone/lat_lng_to_timezone.dart' as tzmap; import 'package:path_provider/path_provider.dart'; import 'package:rain/app/api/api.dart'; -import 'package:rain/app/data/weather.dart'; -import 'package:rain/app/services/notification.dart'; -import 'package:rain/app/services/utils.dart'; -import 'package:rain/app/widgets/status/status_data.dart'; -import 'package:rain/app/widgets/status/status_weather.dart'; +import 'package:rain/app/data/db.dart'; +import 'package:rain/app/utils/notification.dart'; +import 'package:rain/app/utils/show_snack_bar.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_data.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_weather.dart'; import 'package:rain/main.dart'; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; import 'package:timezone/data/latest_all.dart' as tz; diff --git a/lib/app/data/weather.dart b/lib/app/data/db.dart similarity index 99% rename from lib/app/data/weather.dart rename to lib/app/data/db.dart index c5e45db..38c43f4 100644 --- a/lib/app/data/weather.dart +++ b/lib/app/data/db.dart @@ -1,6 +1,6 @@ import 'package:isar/isar.dart'; -part 'weather.g.dart'; +part 'db.g.dart'; @collection class Settings { diff --git a/lib/app/data/weather.g.dart b/lib/app/data/db.g.dart similarity index 99% rename from lib/app/data/weather.g.dart rename to lib/app/data/db.g.dart index 5b6ffca..e2dbe3b 100644 --- a/lib/app/data/weather.g.dart +++ b/lib/app/data/db.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'weather.dart'; +part of 'db.dart'; // ************************************************************************** // IsarCollectionGenerator diff --git a/lib/app/modules/geolocation.dart b/lib/app/ui/geolocation.dart similarity index 99% rename from lib/app/modules/geolocation.dart rename to lib/app/ui/geolocation.dart index 1af8ca4..cca9cbf 100644 --- a/lib/app/modules/geolocation.dart +++ b/lib/app/ui/geolocation.dart @@ -9,9 +9,9 @@ import 'package:latlong2/latlong.dart'; import 'package:rain/app/api/api.dart'; import 'package:rain/app/api/city_api.dart'; import 'package:rain/app/controller/controller.dart'; -import 'package:rain/app/modules/home.dart'; -import 'package:rain/app/widgets/button.dart'; -import 'package:rain/app/widgets/text_form.dart'; +import 'package:rain/app/ui/home.dart'; +import 'package:rain/app/ui/widgets/button.dart'; +import 'package:rain/app/ui/widgets/text_form.dart'; import 'package:rain/main.dart'; class SelectGeolocation extends StatefulWidget { diff --git a/lib/app/modules/home.dart b/lib/app/ui/home.dart similarity index 93% rename from lib/app/modules/home.dart rename to lib/app/ui/home.dart index a25b028..a566e77 100644 --- a/lib/app/modules/home.dart +++ b/lib/app/ui/home.dart @@ -5,14 +5,14 @@ import 'package:isar/isar.dart'; import 'package:rain/app/api/api.dart'; import 'package:rain/app/api/city_api.dart'; import 'package:rain/app/controller/controller.dart'; -import 'package:rain/app/data/weather.dart'; -import 'package:rain/app/modules/cards/view/list_weather_card.dart'; -import 'package:rain/app/modules/cards/widgets/create_card_weather.dart'; -import 'package:rain/app/modules/geolocation.dart'; -import 'package:rain/app/modules/main/view/weather_main.dart'; -import 'package:rain/app/modules/map/view/map.dart'; -import 'package:rain/app/modules/settings/view/settings.dart'; -import 'package:rain/app/services/utils.dart'; +import 'package:rain/app/data/db.dart'; +import 'package:rain/app/ui/places/view/place_list.dart'; +import 'package:rain/app/ui/places/widgets/create_place.dart'; +import 'package:rain/app/ui/geolocation.dart'; +import 'package:rain/app/ui/main/view/main.dart'; +import 'package:rain/app/ui/map/view/map.dart'; +import 'package:rain/app/ui/settings/view/settings.dart'; +import 'package:rain/app/utils/show_snack_bar.dart'; import 'package:rain/main.dart'; class HomePage extends StatefulWidget { @@ -31,9 +31,9 @@ class _HomePageState extends State with TickerProviderStateMixin { final _controller = TextEditingController(); final List pages = [ - const WeatherPage(), - const ListWeatherCard(), - if (!settings.hideMap) const MapWeather(), + const MainPage(), + const PlaceList(), + if (!settings.hideMap) const MapPage(), const SettingsPage(), ]; @@ -289,8 +289,7 @@ class _HomePageState extends State with TickerProviderStateMixin { context: context, isScrollControlled: true, enableDrag: false, - builder: (BuildContext context) => - const CreateWeatherCard(), + builder: (BuildContext context) => const CreatePlace(), ), child: const Icon( IconsaxPlusLinear.add, diff --git a/lib/app/modules/main/view/weather_main.dart b/lib/app/ui/main/view/main.dart similarity index 89% rename from lib/app/modules/main/view/weather_main.dart rename to lib/app/ui/main/view/main.dart index 4cba272..d418b0b 100644 --- a/lib/app/modules/main/view/weather_main.dart +++ b/lib/app/ui/main/view/main.dart @@ -1,24 +1,24 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:rain/app/controller/controller.dart'; -import 'package:rain/app/data/weather.dart'; -import 'package:rain/app/widgets/daily/weather_daily.dart'; -import 'package:rain/app/widgets/daily/weather_more.dart'; -import 'package:rain/app/widgets/desc/desc_container.dart'; -import 'package:rain/app/widgets/hourly/weather_hourly.dart'; -import 'package:rain/app/widgets/now/weather_now.dart'; -import 'package:rain/app/widgets/shimmer.dart'; -import 'package:rain/app/widgets/sun_moon/sunset_sunrise.dart'; +import 'package:rain/app/data/db.dart'; +import 'package:rain/app/ui/widgets/weather/daily/daily_card_list.dart'; +import 'package:rain/app/ui/widgets/weather/daily/daily_container.dart'; +import 'package:rain/app/ui/widgets/weather/desc/desc_container.dart'; +import 'package:rain/app/ui/widgets/weather/hourly.dart'; +import 'package:rain/app/ui/widgets/weather/now.dart'; +import 'package:rain/app/ui/widgets/shimmer.dart'; +import 'package:rain/app/ui/widgets/weather/sunset_sunrise.dart'; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; -class WeatherPage extends StatefulWidget { - const WeatherPage({super.key}); +class MainPage extends StatefulWidget { + const MainPage({super.key}); @override - State createState() => _WeatherPageState(); + State createState() => _MainPageState(); } -class _WeatherPageState extends State { +class _MainPageState extends State { final weatherController = Get.put(WeatherController()); @override @@ -69,7 +69,7 @@ class _WeatherPageState extends State { return ListView( children: [ - WeatherNow( + Now( time: mainWeather.time![hourOfDay], weather: mainWeather.weathercode![hourOfDay], degree: mainWeather.temperature2M![hourOfDay], @@ -122,7 +122,7 @@ class _WeatherPageState extends State { Radius.circular(20), ), ), - child: WeatherHourly( + child: Hourly( time: mainWeather.time![i], weather: mainWeather.weathercode![i], degree: mainWeather.temperature2M![i], @@ -160,10 +160,10 @@ class _WeatherPageState extends State { initiallyExpanded: false, title: 'hourlyVariables'.tr, ), - WeatherDaily( + DailyContainer( weatherData: weatherCard, onTap: () => Get.to( - () => WeatherMore( + () => DailyCardList( weatherData: weatherCard, ), transition: Transition.downToUp, diff --git a/lib/app/modules/map/view/map.dart b/lib/app/ui/map/view/map.dart similarity index 95% rename from lib/app/modules/map/view/map.dart rename to lib/app/ui/map/view/map.dart index 1c6a792..99698a6 100644 --- a/lib/app/modules/map/view/map.dart +++ b/lib/app/ui/map/view/map.dart @@ -14,23 +14,23 @@ import 'package:path_provider/path_provider.dart'; import 'package:rain/app/api/api.dart'; import 'package:rain/app/api/city_api.dart'; import 'package:rain/app/controller/controller.dart'; -import 'package:rain/app/data/weather.dart'; -import 'package:rain/app/modules/cards/view/info_weather_card.dart'; -import 'package:rain/app/modules/cards/widgets/create_card_weather.dart'; -import 'package:rain/app/modules/cards/widgets/weather_card_container.dart'; -import 'package:rain/app/widgets/status/status_data.dart'; -import 'package:rain/app/widgets/status/status_weather.dart'; -import 'package:rain/app/widgets/text_form.dart'; +import 'package:rain/app/data/db.dart'; +import 'package:rain/app/ui/places/view/place_info.dart'; +import 'package:rain/app/ui/places/widgets/create_place.dart'; +import 'package:rain/app/ui/places/widgets/place_card.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_data.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_weather.dart'; +import 'package:rain/app/ui/widgets/text_form.dart'; import 'package:rain/main.dart'; -class MapWeather extends StatefulWidget { - const MapWeather({super.key}); +class MapPage extends StatefulWidget { + const MapPage({super.key}); @override - State createState() => _MapWeatherState(); + State createState() => _MapPageState(); } -class _MapWeatherState extends State with TickerProviderStateMixin { +class _MapPageState extends State with TickerProviderStateMixin { late final AnimatedMapController _animatedMapController = AnimatedMapController(vsync: this); final weatherController = Get.put(WeatherController()); @@ -202,10 +202,10 @@ class _MapWeatherState extends State with TickerProviderStateMixin { position: _offsetAnimation, child: GestureDetector( onTap: () => Get.to( - () => InfoWeatherCard(weatherCard: _selectedWeatherCard!), + () => PlaceInfo(weatherCard: _selectedWeatherCard!), transition: Transition.downToUp, ), - child: WeatherCardContainer( + child: PlaceCard( time: _selectedWeatherCard!.time!, timeDaily: _selectedWeatherCard!.timeDaily!, timeDay: _selectedWeatherCard!.sunrise!, @@ -265,7 +265,7 @@ class _MapWeatherState extends State with TickerProviderStateMixin { context: context, isScrollControlled: true, enableDrag: false, - builder: (BuildContext context) => CreateWeatherCard( + builder: (BuildContext context) => CreatePlace( latitude: '${point.latitude}', longitude: '${point.longitude}', ), diff --git a/lib/app/modules/onboarding.dart b/lib/app/ui/onboarding.dart similarity index 97% rename from lib/app/modules/onboarding.dart rename to lib/app/ui/onboarding.dart index 07a2999..38ef116 100644 --- a/lib/app/modules/onboarding.dart +++ b/lib/app/ui/onboarding.dart @@ -1,7 +1,7 @@ import 'package:gap/gap.dart'; -import 'package:rain/app/data/weather.dart'; -import 'package:rain/app/modules/geolocation.dart'; -import 'package:rain/app/widgets/button.dart'; +import 'package:rain/app/data/db.dart'; +import 'package:rain/app/ui/geolocation.dart'; +import 'package:rain/app/ui/widgets/button.dart'; import 'package:rain/main.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/app/modules/cards/view/info_weather_card.dart b/lib/app/ui/places/view/place_info.dart similarity index 90% rename from lib/app/modules/cards/view/info_weather_card.dart rename to lib/app/ui/places/view/place_info.dart index 8079045..c4c513b 100644 --- a/lib/app/modules/cards/view/info_weather_card.dart +++ b/lib/app/ui/places/view/place_info.dart @@ -2,27 +2,27 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:iconsax_plus/iconsax_plus.dart'; import 'package:rain/app/controller/controller.dart'; -import 'package:rain/app/data/weather.dart'; -import 'package:rain/app/widgets/daily/weather_daily.dart'; -import 'package:rain/app/widgets/daily/weather_more.dart'; -import 'package:rain/app/widgets/desc/desc_container.dart'; -import 'package:rain/app/widgets/hourly/weather_hourly.dart'; -import 'package:rain/app/widgets/now/weather_now.dart'; -import 'package:rain/app/widgets/sun_moon/sunset_sunrise.dart'; +import 'package:rain/app/data/db.dart'; +import 'package:rain/app/ui/widgets/weather/daily/daily_card_list.dart'; +import 'package:rain/app/ui/widgets/weather/daily/daily_container.dart'; +import 'package:rain/app/ui/widgets/weather/desc/desc_container.dart'; +import 'package:rain/app/ui/widgets/weather/hourly.dart'; +import 'package:rain/app/ui/widgets/weather/now.dart'; +import 'package:rain/app/ui/widgets/weather/sunset_sunrise.dart'; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; -class InfoWeatherCard extends StatefulWidget { - const InfoWeatherCard({ +class PlaceInfo extends StatefulWidget { + const PlaceInfo({ super.key, required this.weatherCard, }); final WeatherCard weatherCard; @override - State createState() => _InfoWeatherCardState(); + State createState() => _PlaceInfoState(); } -class _InfoWeatherCardState extends State { +class _PlaceInfoState extends State { int timeNow = 0; int dayNow = 0; final weatherController = Get.put(WeatherController()); @@ -87,7 +87,7 @@ class _InfoWeatherCardState extends State { padding: const EdgeInsets.symmetric(horizontal: 10), child: ListView( children: [ - WeatherNow( + Now( time: weatherCard.time![timeNow], weather: weatherCard.weathercode![timeNow], degree: weatherCard.temperature2M![timeNow], @@ -136,7 +136,7 @@ class _InfoWeatherCardState extends State { Radius.circular(20), ), ), - child: WeatherHourly( + child: Hourly( time: weatherCard.time![i], weather: weatherCard.weathercode![i], degree: weatherCard.temperature2M![i], @@ -173,10 +173,10 @@ class _InfoWeatherCardState extends State { initiallyExpanded: false, title: 'hourlyVariables'.tr, ), - WeatherDaily( + DailyContainer( weatherData: weatherCard, onTap: () => Get.to( - () => WeatherMore( + () => DailyCardList( weatherData: weatherCard, ), transition: Transition.downToUp, diff --git a/lib/app/modules/cards/view/list_weather_card.dart b/lib/app/ui/places/view/place_list.dart similarity index 88% rename from lib/app/modules/cards/view/list_weather_card.dart rename to lib/app/ui/places/view/place_list.dart index 76b6cb3..6f899b8 100644 --- a/lib/app/modules/cards/view/list_weather_card.dart +++ b/lib/app/ui/places/view/place_list.dart @@ -2,17 +2,17 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:iconsax_plus/iconsax_plus.dart'; import 'package:rain/app/controller/controller.dart'; -import 'package:rain/app/modules/cards/widgets/weather_card_list.dart'; -import 'package:rain/app/widgets/text_form.dart'; +import 'package:rain/app/ui/places/widgets/place_card_list.dart'; +import 'package:rain/app/ui/widgets/text_form.dart'; -class ListWeatherCard extends StatefulWidget { - const ListWeatherCard({super.key}); +class PlaceList extends StatefulWidget { + const PlaceList({super.key}); @override - State createState() => _ListWeatherCardState(); + State createState() => _PlaceListState(); } -class _ListWeatherCardState extends State { +class _PlaceListState extends State { final weatherController = Get.put(WeatherController()); TextEditingController searchTasks = TextEditingController(); String filter = ''; @@ -95,7 +95,7 @@ class _ListWeatherCardState extends State { await weatherController.updateCacheCard(true); setState(() {}); }, - child: WeatherCardList(searchCity: filter), + child: PlaceCardList(searchCity: filter), ), ), ); diff --git a/lib/app/modules/cards/widgets/create_card_weather.dart b/lib/app/ui/places/widgets/create_place.dart similarity index 97% rename from lib/app/modules/cards/widgets/create_card_weather.dart rename to lib/app/ui/places/widgets/create_place.dart index d2d4c97..b72ec47 100644 --- a/lib/app/modules/cards/widgets/create_card_weather.dart +++ b/lib/app/ui/places/widgets/create_place.dart @@ -4,12 +4,12 @@ import 'package:iconsax_plus/iconsax_plus.dart'; import 'package:rain/app/api/api.dart'; import 'package:rain/app/api/city_api.dart'; import 'package:rain/app/controller/controller.dart'; -import 'package:rain/app/widgets/button.dart'; -import 'package:rain/app/widgets/text_form.dart'; +import 'package:rain/app/ui/widgets/button.dart'; +import 'package:rain/app/ui/widgets/text_form.dart'; import 'package:rain/main.dart'; -class CreateWeatherCard extends StatefulWidget { - const CreateWeatherCard({ +class CreatePlace extends StatefulWidget { + const CreatePlace({ super.key, this.latitude, this.longitude, @@ -18,10 +18,10 @@ class CreateWeatherCard extends StatefulWidget { final String? longitude; @override - State createState() => _CreateWeatherCardState(); + State createState() => _CreatePlaceState(); } -class _CreateWeatherCardState extends State +class _CreatePlaceState extends State with SingleTickerProviderStateMixin { bool isLoading = false; final formKey = GlobalKey(); diff --git a/lib/app/modules/cards/widgets/weather_card_container.dart b/lib/app/ui/places/widgets/place_card.dart similarity index 92% rename from lib/app/modules/cards/widgets/weather_card_container.dart rename to lib/app/ui/places/widgets/place_card.dart index 7c977b4..93a08a9 100644 --- a/lib/app/modules/cards/widgets/weather_card_container.dart +++ b/lib/app/ui/places/widgets/place_card.dart @@ -2,12 +2,12 @@ import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; import 'package:get/get.dart'; import 'package:rain/app/controller/controller.dart'; -import 'package:rain/app/widgets/status/status_weather.dart'; -import 'package:rain/app/widgets/status/status_data.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_weather.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_data.dart'; import 'package:timezone/standalone.dart' as tz; -class WeatherCardContainer extends StatefulWidget { - const WeatherCardContainer({ +class PlaceCard extends StatefulWidget { + const PlaceCard({ super.key, required this.time, required this.weather, @@ -30,10 +30,10 @@ class WeatherCardContainer extends StatefulWidget { final String timezone; @override - State createState() => _WeatherCardContainerState(); + State createState() => _PlaceCardState(); } -class _WeatherCardContainerState extends State { +class _PlaceCardState extends State { final statusWeather = StatusWeather(); final statusData = StatusData(); final weatherController = Get.put(WeatherController()); diff --git a/lib/app/modules/cards/widgets/weather_card_list.dart b/lib/app/ui/places/widgets/place_card_list.dart similarity index 89% rename from lib/app/modules/cards/widgets/weather_card_list.dart rename to lib/app/ui/places/widgets/place_card_list.dart index a0e0b88..a603f3e 100644 --- a/lib/app/modules/cards/widgets/weather_card_list.dart +++ b/lib/app/ui/places/widgets/place_card_list.dart @@ -2,21 +2,21 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:iconsax_plus/iconsax_plus.dart'; import 'package:rain/app/controller/controller.dart'; -import 'package:rain/app/modules/cards/view/info_weather_card.dart'; -import 'package:rain/app/modules/cards/widgets/weather_card_container.dart'; +import 'package:rain/app/ui/places/view/place_info.dart'; +import 'package:rain/app/ui/places/widgets/place_card.dart'; -class WeatherCardList extends StatefulWidget { - const WeatherCardList({ +class PlaceCardList extends StatefulWidget { + const PlaceCardList({ super.key, required this.searchCity, }); final String searchCity; @override - State createState() => _WeatherCardListState(); + State createState() => _PlaceCardListState(); } -class _WeatherCardListState extends State { +class _PlaceCardListState extends State { final weatherController = Get.put(WeatherController()); @override @@ -90,12 +90,12 @@ class _WeatherCardListState extends State { }, child: GestureDetector( onTap: () => Get.to( - () => InfoWeatherCard( + () => PlaceInfo( weatherCard: weatherCardList, ), transition: Transition.downToUp, ), - child: WeatherCardContainer( + child: PlaceCard( time: weatherCardList.time!, timeDaily: weatherCardList.timeDaily!, timeDay: weatherCardList.sunrise!, diff --git a/lib/app/modules/settings/view/settings.dart b/lib/app/ui/settings/view/settings.dart similarity index 99% rename from lib/app/modules/settings/view/settings.dart rename to lib/app/ui/settings/view/settings.dart index 9fe8ab8..f227b62 100644 --- a/lib/app/modules/settings/view/settings.dart +++ b/lib/app/ui/settings/view/settings.dart @@ -13,11 +13,11 @@ import 'package:line_awesome_flutter/line_awesome_flutter.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:path_provider/path_provider.dart'; import 'package:rain/app/controller/controller.dart'; -import 'package:rain/app/data/weather.dart'; -import 'package:rain/app/modules/settings/widgets/setting_card.dart'; +import 'package:rain/app/data/db.dart'; +import 'package:rain/app/ui/settings/widgets/setting_card.dart'; import 'package:rain/main.dart'; import 'package:rain/theme/theme_controller.dart'; -import 'package:rain/utils/color_converter.dart'; +import 'package:rain/app/utils/color_converter.dart'; import 'package:restart_app/restart_app.dart'; class SettingsPage extends StatefulWidget { @@ -1124,7 +1124,7 @@ class _SettingsPageState extends State { icon: const Icon(IconsaxPlusLinear.document), text: 'license'.tr, onPressed: () => Get.to( - LicensePage( + () => LicensePage( applicationIcon: Container( width: 100, height: 100, diff --git a/lib/app/modules/settings/widgets/setting_card.dart b/lib/app/ui/settings/widgets/setting_card.dart similarity index 100% rename from lib/app/modules/settings/widgets/setting_card.dart rename to lib/app/ui/settings/widgets/setting_card.dart diff --git a/lib/app/widgets/button.dart b/lib/app/ui/widgets/button.dart similarity index 100% rename from lib/app/widgets/button.dart rename to lib/app/ui/widgets/button.dart diff --git a/lib/app/widgets/shimmer.dart b/lib/app/ui/widgets/shimmer.dart similarity index 100% rename from lib/app/widgets/shimmer.dart rename to lib/app/ui/widgets/shimmer.dart diff --git a/lib/app/widgets/text_form.dart b/lib/app/ui/widgets/text_form.dart similarity index 100% rename from lib/app/widgets/text_form.dart rename to lib/app/ui/widgets/text_form.dart diff --git a/lib/app/widgets/daily/list_daily_card.dart b/lib/app/ui/widgets/weather/daily/daily_card.dart similarity index 89% rename from lib/app/widgets/daily/list_daily_card.dart rename to lib/app/ui/widgets/weather/daily/daily_card.dart index e8c8ef3..ca519a5 100644 --- a/lib/app/widgets/daily/list_daily_card.dart +++ b/lib/app/ui/widgets/weather/daily/daily_card.dart @@ -2,12 +2,12 @@ import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:rain/app/widgets/status/status_weather.dart'; -import 'package:rain/app/widgets/status/status_data.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_weather.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_data.dart'; import 'package:rain/main.dart'; -class ListDailyCard extends StatefulWidget { - const ListDailyCard({ +class DailyCard extends StatefulWidget { + const DailyCard({ super.key, required this.timeDaily, required this.weathercodeDaily, @@ -20,10 +20,10 @@ class ListDailyCard extends StatefulWidget { final double? temperature2MMin; @override - State createState() => _ListDailyCardState(); + State createState() => _DailyCardState(); } -class _ListDailyCardState extends State { +class _DailyCardState extends State { final statusWeather = StatusWeather(); final statusData = StatusData(); diff --git a/lib/app/widgets/daily/info_daily_card.dart b/lib/app/ui/widgets/weather/daily/daily_card_info.dart similarity index 92% rename from lib/app/widgets/daily/info_daily_card.dart rename to lib/app/ui/widgets/weather/daily/daily_card_info.dart index 64fe1d4..4290164 100644 --- a/lib/app/widgets/daily/info_daily_card.dart +++ b/lib/app/ui/widgets/weather/daily/daily_card_info.dart @@ -2,19 +2,19 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:iconsax_plus/iconsax_plus.dart'; import 'package:intl/intl.dart'; -import 'package:rain/app/data/weather.dart'; -import 'package:rain/app/widgets/desc/desc_container.dart'; -import 'package:rain/app/widgets/desc/message.dart'; -import 'package:rain/app/widgets/hourly/weather_hourly.dart'; -import 'package:rain/app/widgets/now/weather_now.dart'; -import 'package:rain/app/widgets/status/status_data.dart'; -import 'package:rain/app/widgets/status/status_weather.dart'; -import 'package:rain/app/widgets/sun_moon/sunset_sunrise.dart'; +import 'package:rain/app/data/db.dart'; +import 'package:rain/app/ui/widgets/weather/desc/desc_container.dart'; +import 'package:rain/app/ui/widgets/weather/desc/message.dart'; +import 'package:rain/app/ui/widgets/weather/hourly.dart'; +import 'package:rain/app/ui/widgets/weather/now.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_data.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_weather.dart'; +import 'package:rain/app/ui/widgets/weather/sunset_sunrise.dart'; import 'package:rain/main.dart'; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; -class InfoDailyCard extends StatefulWidget { - const InfoDailyCard({ +class DailyCardInfo extends StatefulWidget { + const DailyCardInfo({ super.key, required this.weatherData, required this.index, @@ -24,10 +24,10 @@ class InfoDailyCard extends StatefulWidget { final int index; @override - State createState() => _InfoDailyCardState(); + State createState() => _DailyCardInfoState(); } -class _InfoDailyCardState extends State { +class _DailyCardInfoState extends State { final statusWeather = StatusWeather(); final statusData = StatusData(); final message = Message(); @@ -118,7 +118,7 @@ class _InfoDailyCardState extends State { margin: const EdgeInsets.symmetric(horizontal: 10), child: ListView( children: [ - WeatherNow( + Now( weather: weatherData.weathercode![startIndex + hourOfDay], degree: weatherData @@ -172,7 +172,7 @@ class _InfoDailyCardState extends State { Radius.circular(20), ), ), - child: WeatherHourly( + child: Hourly( time: weatherData.time![hourlyIndex], weather: weatherData .weathercode![hourlyIndex], diff --git a/lib/app/widgets/daily/weather_more.dart b/lib/app/ui/widgets/weather/daily/daily_card_list.dart similarity index 79% rename from lib/app/widgets/daily/weather_more.dart rename to lib/app/ui/widgets/weather/daily/daily_card_list.dart index 348b003..55a7442 100644 --- a/lib/app/widgets/daily/weather_more.dart +++ b/lib/app/ui/widgets/weather/daily/daily_card_list.dart @@ -1,22 +1,22 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:iconsax_plus/iconsax_plus.dart'; -import 'package:rain/app/data/weather.dart'; -import 'package:rain/app/widgets/daily/info_daily_card.dart'; -import 'package:rain/app/widgets/daily/list_daily_card.dart'; +import 'package:rain/app/data/db.dart'; +import 'package:rain/app/ui/widgets/weather/daily/daily_card_info.dart'; +import 'package:rain/app/ui/widgets/weather/daily/daily_card.dart'; -class WeatherMore extends StatefulWidget { - const WeatherMore({ +class DailyCardList extends StatefulWidget { + const DailyCardList({ super.key, required this.weatherData, }); final WeatherCard weatherData; @override - State createState() => _WeatherMoreState(); + State createState() => _DailyCardListState(); } -class _WeatherMoreState extends State { +class _DailyCardListState extends State { @override Widget build(BuildContext context) { const transparent = Colors.transparent; @@ -51,13 +51,13 @@ class _WeatherMoreState extends State { itemCount: timeDaily.length, itemBuilder: (context, index) => GestureDetector( onTap: () => Get.to( - () => InfoDailyCard( + () => DailyCardInfo( weatherData: weatherData, index: index, ), transition: Transition.downToUp, ), - child: ListDailyCard( + child: DailyCard( timeDaily: timeDaily[index], weathercodeDaily: weatherData.weathercodeDaily![index], temperature2MMax: weatherData.temperature2MMax![index], diff --git a/lib/app/widgets/daily/weather_daily.dart b/lib/app/ui/widgets/weather/daily/daily_container.dart similarity index 90% rename from lib/app/widgets/daily/weather_daily.dart rename to lib/app/ui/widgets/weather/daily/daily_container.dart index ed427db..cc62e0a 100644 --- a/lib/app/widgets/daily/weather_daily.dart +++ b/lib/app/ui/widgets/weather/daily/daily_container.dart @@ -2,14 +2,14 @@ import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:rain/app/data/weather.dart'; -import 'package:rain/app/widgets/daily/info_daily_card.dart'; -import 'package:rain/app/widgets/status/status_data.dart'; -import 'package:rain/app/widgets/status/status_weather.dart'; +import 'package:rain/app/data/db.dart'; +import 'package:rain/app/ui/widgets/weather/daily/daily_card_info.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_data.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_weather.dart'; import 'package:rain/main.dart'; -class WeatherDaily extends StatefulWidget { - const WeatherDaily({ +class DailyContainer extends StatefulWidget { + const DailyContainer({ super.key, required this.weatherData, required this.onTap, @@ -19,10 +19,10 @@ class WeatherDaily extends StatefulWidget { final VoidCallback onTap; @override - State createState() => _WeatherDailyState(); + State createState() => _DailyContainerState(); } -class _WeatherDailyState extends State { +class _DailyContainerState extends State { final statusWeather = StatusWeather(); final statusData = StatusData(); @@ -53,7 +53,7 @@ class _WeatherDailyState extends State { splashColor: splashColor, borderRadius: inkWellBorderRadius, onTap: () => Get.to( - () => InfoDailyCard( + () => DailyCardInfo( weatherData: weatherData, index: index, ), diff --git a/lib/app/widgets/desc/desc.dart b/lib/app/ui/widgets/weather/desc/desc.dart similarity index 100% rename from lib/app/widgets/desc/desc.dart rename to lib/app/ui/widgets/weather/desc/desc.dart diff --git a/lib/app/widgets/desc/desc_container.dart b/lib/app/ui/widgets/weather/desc/desc_container.dart similarity index 98% rename from lib/app/widgets/desc/desc_container.dart rename to lib/app/ui/widgets/weather/desc/desc_container.dart index ce132ed..e9d3ad1 100644 --- a/lib/app/widgets/desc/desc_container.dart +++ b/lib/app/ui/widgets/weather/desc/desc_container.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:rain/app/widgets/desc/desc.dart'; -import 'package:rain/app/widgets/desc/message.dart'; -import 'package:rain/app/widgets/status/status_data.dart'; +import 'package:rain/app/ui/widgets/weather/desc/desc.dart'; +import 'package:rain/app/ui/widgets/weather/desc/message.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_data.dart'; class DescContainer extends StatefulWidget { const DescContainer({ diff --git a/lib/app/widgets/desc/message.dart b/lib/app/ui/widgets/weather/desc/message.dart similarity index 100% rename from lib/app/widgets/desc/message.dart rename to lib/app/ui/widgets/weather/desc/message.dart diff --git a/lib/app/widgets/hourly/weather_hourly.dart b/lib/app/ui/widgets/weather/hourly.dart similarity index 83% rename from lib/app/widgets/hourly/weather_hourly.dart rename to lib/app/ui/widgets/weather/hourly.dart index ecc9051..df504a3 100644 --- a/lib/app/widgets/hourly/weather_hourly.dart +++ b/lib/app/ui/widgets/weather/hourly.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:rain/app/widgets/status/status_data.dart'; -import 'package:rain/app/widgets/status/status_weather.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_data.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_weather.dart'; import 'package:rain/main.dart'; -class WeatherHourly extends StatefulWidget { - const WeatherHourly({ +class Hourly extends StatefulWidget { + const Hourly({ super.key, required this.time, required this.weather, @@ -21,10 +21,10 @@ class WeatherHourly extends StatefulWidget { final double degree; @override - State createState() => _WeatherHourlyState(); + State createState() => _HourlyState(); } -class _WeatherHourlyState extends State { +class _HourlyState extends State { final statusWeather = StatusWeather(); final statusData = StatusData(); diff --git a/lib/app/widgets/now/weather_now.dart b/lib/app/ui/widgets/weather/now.dart similarity index 94% rename from lib/app/widgets/now/weather_now.dart rename to lib/app/ui/widgets/weather/now.dart index 7d385c7..6e1c3a3 100644 --- a/lib/app/widgets/now/weather_now.dart +++ b/lib/app/ui/widgets/weather/now.dart @@ -2,12 +2,12 @@ import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; -import 'package:rain/app/widgets/status/status_data.dart'; -import 'package:rain/app/widgets/status/status_weather.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_data.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_weather.dart'; import 'package:rain/main.dart'; -class WeatherNow extends StatefulWidget { - const WeatherNow({ +class Now extends StatefulWidget { + const Now({ super.key, required this.weather, required this.degree, @@ -28,10 +28,10 @@ class WeatherNow extends StatefulWidget { final double feels; @override - State createState() => _WeatherNowState(); + State createState() => _NowState(); } -class _WeatherNowState extends State { +class _NowState extends State { final statusWeather = StatusWeather(); final statusData = StatusData(); diff --git a/lib/app/widgets/status/status_data.dart b/lib/app/ui/widgets/weather/status/status_data.dart similarity index 100% rename from lib/app/widgets/status/status_data.dart rename to lib/app/ui/widgets/weather/status/status_data.dart diff --git a/lib/app/widgets/status/status_weather.dart b/lib/app/ui/widgets/weather/status/status_weather.dart similarity index 100% rename from lib/app/widgets/status/status_weather.dart rename to lib/app/ui/widgets/weather/status/status_weather.dart diff --git a/lib/app/widgets/sun_moon/sunset_sunrise.dart b/lib/app/ui/widgets/weather/sunset_sunrise.dart similarity index 97% rename from lib/app/widgets/sun_moon/sunset_sunrise.dart rename to lib/app/ui/widgets/weather/sunset_sunrise.dart index a8f1ed7..e7f0556 100644 --- a/lib/app/widgets/sun_moon/sunset_sunrise.dart +++ b/lib/app/ui/widgets/weather/sunset_sunrise.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:gap/gap.dart'; -import 'package:rain/app/widgets/status/status_data.dart'; +import 'package:rain/app/ui/widgets/weather/status/status_data.dart'; class SunsetSunrise extends StatefulWidget { const SunsetSunrise({ diff --git a/lib/utils/color_converter.dart b/lib/app/utils/color_converter.dart similarity index 100% rename from lib/utils/color_converter.dart rename to lib/app/utils/color_converter.dart diff --git a/lib/utils/device_info.dart b/lib/app/utils/device_info.dart similarity index 100% rename from lib/utils/device_info.dart rename to lib/app/utils/device_info.dart diff --git a/lib/app/services/notification.dart b/lib/app/utils/notification.dart similarity index 100% rename from lib/app/services/notification.dart rename to lib/app/utils/notification.dart diff --git a/lib/app/services/utils.dart b/lib/app/utils/show_snack_bar.dart similarity index 100% rename from lib/app/services/utils.dart rename to lib/app/utils/show_snack_bar.dart diff --git a/lib/main.dart b/lib/main.dart index f64b228..4f71266 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -14,14 +14,14 @@ import 'package:internet_connection_checker_plus/internet_connection_checker_plu import 'package:isar/isar.dart'; import 'package:path_provider/path_provider.dart'; import 'package:rain/app/controller/controller.dart'; -import 'package:rain/app/data/weather.dart'; -import 'package:rain/app/modules/geolocation.dart'; -import 'package:rain/app/modules/home.dart'; -import 'package:rain/app/modules/onboarding.dart'; +import 'package:rain/app/data/db.dart'; +import 'package:rain/app/ui/geolocation.dart'; +import 'package:rain/app/ui/home.dart'; +import 'package:rain/app/ui/onboarding.dart'; import 'package:rain/theme/theme.dart'; import 'package:rain/theme/theme_controller.dart'; import 'package:rain/translation/translation.dart'; -import 'package:rain/utils/device_info.dart'; +import 'package:rain/app/utils/device_info.dart'; import 'package:time_machine/time_machine.dart'; import 'package:timezone/data/latest_all.dart' as tz; import 'package:timezone/timezone.dart' as tz; diff --git a/lib/theme/theme_controller.dart b/lib/theme/theme_controller.dart index e72d6e2..8bf4301 100644 --- a/lib/theme/theme_controller.dart +++ b/lib/theme/theme_controller.dart @@ -1,6 +1,6 @@ import 'package:get/get.dart'; import 'package:flutter/material.dart'; -import 'package:rain/app/data/weather.dart'; +import 'package:rain/app/data/db.dart'; import 'package:rain/main.dart'; class ThemeController extends GetxController { diff --git a/pubspec.lock b/pubspec.lock index 393acfa..e1f463d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -266,10 +266,10 @@ packages: dependency: "direct main" description: name: dio - sha256: "0dfb6b6a1979dac1c1245e17cef824d7b452ea29bd33d3467269f9bef3715fb0" + sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260" url: "https://pub.dev" source: hosted - version: "5.6.0" + version: "5.7.0" dio_cache_interceptor: dependency: "direct main" description: @@ -1014,10 +1014,10 @@ packages: dependency: "direct main" description: name: restart_app - sha256: b37daeb1c02fcab30e19d9e30b6fdd215bd53577efd927042eb77cf6f09daadb + sha256: ed8b6a3223e90dcd5d9e44c79b66b96f5527a2467ba2b1ec2c242c3807dbd435 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" scrollable_positioned_list: dependency: "direct main" description: @@ -1267,10 +1267,10 @@ packages: dependency: transitive description: name: uuid - sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90" + sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77 url: "https://pub.dev" source: hosted - version: "4.4.2" + version: "4.5.0" vector_math: dependency: transitive description: @@ -1384,5 +1384,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.1 <4.0.0" + dart: ">=3.5.2 <4.0.0" flutter: ">=3.24.0" diff --git a/pubspec.yaml b/pubspec.yaml index 04fbe2e..fa3d251 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: "none" version: 1.3.5+38 environment: - sdk: ">=3.5.1 <4.0.0" + sdk: ">=3.5.2 <4.0.0" dependencies: flutter: @@ -15,7 +15,7 @@ dependencies: sdk: flutter get: ^4.6.6 gap: ^3.0.1 - dio: ^5.6.0 + dio: ^5.7.0 intl: ^0.19.0 shimmer: ^3.0.0 latlong2: ^0.9.1 @@ -24,7 +24,7 @@ dependencies: geolocator: ^13.0.1 home_widget: ^0.7.0 workmanager: ^0.5.2 - restart_app: ^1.2.1 + restart_app: ^1.3.0 flutter_map: ^7.0.2 google_fonts: ^6.2.1 url_launcher: ^6.3.0