diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index db77bb4..387209c 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 17987b7..514d142 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 09d4391..9801130 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index d5f1c8d..7996cac 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 4d6372e..5c4a94d 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/assets/house.jpg b/assets/house.jpg new file mode 100644 index 0000000..e828e3d Binary files /dev/null and b/assets/house.jpg differ diff --git a/assets/svg/ru.svg b/assets/svg/ru.svg new file mode 100644 index 0000000..ae12982 --- /dev/null +++ b/assets/svg/ru.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/svg/uk.svg b/assets/svg/uk.svg new file mode 100644 index 0000000..88e2211 --- /dev/null +++ b/assets/svg/uk.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 6d459c8..ee74416 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -427,7 +427,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -484,7 +484,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index dc9ada4..a32d3f3 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 7353c41..6a6d521 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 797d452..14aefdc 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 6ed2d93..dc97fc2 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 4cd7b00..a0cd80b 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index fe73094..60640d5 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 321773c..3698012 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 797d452..14aefdc 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 502f463..a45c882 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 0ec3034..d3534c5 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 0ec3034..d3534c5 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index e9f5fea..a62d024 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 84ac32a..f85b087 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 8953cba..74ad29b 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 0467bf1..aae1151 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/l10n.yaml b/l10n.yaml new file mode 100644 index 0000000..d26d702 --- /dev/null +++ b/l10n.yaml @@ -0,0 +1,6 @@ +arb-dir: l10n +template-arb-file: app_ru.arb +output-localization-file: app_locale.dart +output-dir: lib/components/locale/l10n +output-class: AppLocale +synthetic-package: false \ No newline at end of file diff --git a/l10n/app_en.arb b/l10n/app_en.arb new file mode 100644 index 0000000..6389d4f --- /dev/null +++ b/l10n/app_en.arb @@ -0,0 +1,7 @@ +{ + "@@locale": "en", + + "cardLiked": "Card added to your favorite :)", + "cardDisliked": "Card deleted from favourite :(", + "searchInputPlaceholder": "Search .." +} \ No newline at end of file diff --git a/l10n/app_ru.arb b/l10n/app_ru.arb new file mode 100644 index 0000000..61019d3 --- /dev/null +++ b/l10n/app_ru.arb @@ -0,0 +1,7 @@ +{ + "@@locale": "ru", + + "cardLiked": "Добавлено в понравившиеся :)", + "cardDisliked": "Удалено из понравившегося :(", + "searchInputPlaceholder": "Поиск .." +} diff --git a/lib/components/extensions/local_context_x.dart b/lib/components/extensions/local_context_x.dart new file mode 100644 index 0000000..8e4a7af --- /dev/null +++ b/lib/components/extensions/local_context_x.dart @@ -0,0 +1,6 @@ +import 'package:flutter/widgets.dart'; +import '../locale/l10n/app_locale.dart'; + +extension LocalContextX on BuildContext { + AppLocale get locale => AppLocale.of(this)!; +} diff --git a/lib/utils/debounce.dart b/lib/components/utils/debounce.dart similarity index 88% rename from lib/utils/debounce.dart rename to lib/components/utils/debounce.dart index 8e44e39..0ea5615 100644 --- a/lib/utils/debounce.dart +++ b/lib/components/utils/debounce.dart @@ -15,8 +15,7 @@ class Debounce { // Статический метод, где action функция, совершающая действие, а delay совершает задержку) static void run( - {required VoidCallback action, - Duration delay = const Duration(milliseconds: 500)}) { + {required VoidCallback action, Duration delay = const Duration(milliseconds: 500)}) { _timer?.cancel(); _timer = Timer(delay, action); } diff --git a/lib/data/dtos/houses_dto.dart b/lib/data/dtos/houses_dto.dart index 8584634..a3f5e2e 100644 --- a/lib/data/dtos/houses_dto.dart +++ b/lib/data/dtos/houses_dto.dart @@ -12,8 +12,7 @@ class HousesDto { const HousesDto({this.data, this.meta}); - factory HousesDto.fromJson(Map json) => - _$HousesDtoFromJson(json); + factory HousesDto.fromJson(Map json) => _$HousesDtoFromJson(json); } @JsonSerializable(createToJson: false) @@ -22,8 +21,7 @@ class MetaDto { const MetaDto({this.pagination}); - factory MetaDto.fromJson(Map json) => - _$MetaDtoFromJson(json); + factory MetaDto.fromJson(Map json) => _$MetaDtoFromJson(json); } @JsonSerializable(createToJson: false) @@ -34,8 +32,7 @@ class PaginationDto { const PaginationDto({this.current, this.last, this.next}); - factory PaginationDto.fromJson(Map json) => - _$PaginationDtoFromJson(json); + factory PaginationDto.fromJson(Map json) => _$PaginationDtoFromJson(json); } @JsonSerializable(createToJson: false) @@ -45,8 +42,7 @@ class HouseDataDto { const HouseDataDto(this.id, this.attributes); - factory HouseDataDto.fromJson(Map json) => - _$HouseDataDtoFromJson(json); + factory HouseDataDto.fromJson(Map json) => _$HouseDataDtoFromJson(json); } @JsonSerializable(createToJson: false) @@ -56,8 +52,7 @@ class HouseAttributesDataDto { final String? image; final String? description; - HouseAttributesDataDto( - this.name, this.location, this.image, this.description); + HouseAttributesDataDto(this.name, this.location, this.image, this.description); factory HouseAttributesDataDto.fromJson(Map json) => _$HouseAttributesDataDtoFromJson(json); diff --git a/lib/data/mapper/house_mapper.dart b/lib/data/mapper/house_mapper.dart index 8b2b4df..052f573 100644 --- a/lib/data/mapper/house_mapper.dart +++ b/lib/data/mapper/house_mapper.dart @@ -4,15 +4,15 @@ import 'package:pmd/models/card_data.dart'; extension HouseDataDtoToModel on HouseDataDto { CardData toDomain() => CardData( + id: id, name: attributes?.name ?? "UNKNOWN", location: attributes?.location ?? "UNKNOWN", // Безопасный доступ к location - image: attributes?.image ?? "https://upload.wikimedia.org/wikipedia/commons/a/a2/Person_Image_Placeholder.png", - description: attributes?.description ?? "UNKNOWN" - ); + image: attributes?.image ?? + "https://upload.wikimedia.org/wikipedia/commons/a/a2/Person_Image_Placeholder.png", + description: attributes?.description ?? "UNKNOWN"); } extension HousesDtoToModel on HousesDto { - HomeData toDomain() => HomeData( - data: data?.map((e) => e.toDomain()).toList(), - nextPage: meta?.pagination?.next); -} \ No newline at end of file + HomeData toDomain() => + HomeData(data: data?.map((e) => e.toDomain()).toList(), nextPage: meta?.pagination?.next); +} diff --git a/lib/data/repositories/api_interface.dart b/lib/data/repositories/api_interface.dart index cd3cdbd..28035a2 100644 --- a/lib/data/repositories/api_interface.dart +++ b/lib/data/repositories/api_interface.dart @@ -3,5 +3,5 @@ import 'package:pmd/models/home_data.dart'; typedef OnErrorCallback = void Function(String? error); abstract class ApiInterface { - Future loadData ({OnErrorCallback? onError}); -} \ No newline at end of file + Future loadData({OnErrorCallback? onError}); +} diff --git a/lib/data/repositories/mock_repository.dart b/lib/data/repositories/mock_repository.dart index 56c51c6..0318e22 100644 --- a/lib/data/repositories/mock_repository.dart +++ b/lib/data/repositories/mock_repository.dart @@ -6,26 +6,31 @@ class MockRepository extends ApiInterface { // Список всех данных final List allData = [ const CardData( + id: "0", name: "house 0", image: "https://cdn0.youla.io/files/images/780_780/63/29/6329d9f543eedb62b7695786-1.jpg", location: "Moscow", description: "description null"), const CardData( + id: "1", name: "house 1", image: "https://cdn0.youla.io/files/images/780_780/63/29/6329d9f543eedb62b7695786-1.jpg", location: "Samara", description: "null"), const CardData( + id: "2", name: "house 2", image: "https://cdn0.youla.io/files/images/780_780/63/29/6329d9f543eedb62b7695786-1.jpg", location: "Moscow", description: "house good, very good"), const CardData( + id: "3", name: "house 3", image: "https://cdn0.youla.io/files/images/780_780/63/29/6329d9f543eedb62b7695786-1.jpg", location: "Kazan", description: "house good"), const CardData( + id: "4", name: "house 4", image: "https://cdn0.youla.io/files/images/780_780/63/29/6329d9f543eedb62b7695786-1.jpg", location: "Moscow", @@ -39,7 +44,7 @@ class MockRepository extends ApiInterface { int pageSize = 2, // Количество элементов на странице List? currentData, // Текущие данные для динамического обновления OnErrorCallback? onError, -}) async { + }) async { try { // Симуляция задержки сети для динамического обновления await Future.delayed(const Duration(seconds: 1)); @@ -55,7 +60,8 @@ class MockRepository extends ApiInterface { // Убедитесь, что индекс не выходит за пределы списка if (startIndex >= filteredData.length) { - return HomeData(data: currentData ?? []); // Возвращаем текущие данные, если больше нет данных + return HomeData( + data: currentData ?? []); // Возвращаем текущие данные, если больше нет данных } // Извлекаем нужную страницу данных @@ -75,4 +81,4 @@ class MockRepository extends ApiInterface { return null; } } -} \ No newline at end of file +} diff --git a/lib/data/repositories/potter_repository.dart b/lib/data/repositories/potter_repository.dart index 7180d8a..bcfb214 100644 --- a/lib/data/repositories/potter_repository.dart +++ b/lib/data/repositories/potter_repository.dart @@ -8,34 +8,23 @@ import 'package:pmd/data/repositories/api_interface.dart'; import 'package:pretty_dio_logger/pretty_dio_logger.dart'; class PotterRepository extends ApiInterface { - static final Dio _dio = Dio( - BaseOptions(connectTimeout: const Duration(seconds: 10))) - ..interceptors.add( - PrettyDioLogger(request: true, requestHeader: true, requestBody: true)); + static final Dio _dio = Dio(BaseOptions(connectTimeout: const Duration(seconds: 10))) + ..interceptors.add(PrettyDioLogger(request: true, requestHeader: true, requestBody: true)); - static const String _baseUrl = - "https://api.potterdb.com/v1"; // https://api.realtor.com/v1 + static const String _baseUrl = "https://api.potterdb.com/v1"; // https://api.realtor.com/v1 @override Future loadData( - {OnErrorCallback? onError, - String? q, - int page = 1, - int pageSize = 10}) async { + {OnErrorCallback? onError, String? q, int page = 1, int pageSize = 10}) async { try { const String url = '$_baseUrl/characters'; final Response response = await _dio.get>( url, - queryParameters: { - 'filter[name_cont]': q, - 'page[number]': page, - 'page[size]': pageSize - }, + queryParameters: {'filter[name_cont]': q, 'page[number]': page, 'page[size]': pageSize}, ); - final HousesDto dto = - HousesDto.fromJson(response.data as Map); + final HousesDto dto = HousesDto.fromJson(response.data as Map); return dto.toDomain(); } on DioException catch (e) { diff --git a/lib/home_page/card.dart b/lib/home_page/card.dart deleted file mode 100644 index 0cf13f9..0000000 --- a/lib/home_page/card.dart +++ /dev/null @@ -1,111 +0,0 @@ -part of "home_page.dart"; - -typedef OnLikeFunction = void Function(String text); - -class _Card extends StatefulWidget { - final String name; - final String location; - final String image; - final String description; - - final OnLikeFunction? onLike; - final VoidCallback? onTap; - - const _Card( - {required this.name, required this.location, required this.image, required this.description, required this.onLike, required this.onTap}); - - factory _Card.fromData(CardData data, {OnLikeFunction? onLike, VoidCallback? onTap}) => - _Card( - name: data.name, - location: data.location, - image: data.image, - description: data.description, - onLike: onLike, - onTap: onTap); - - @override - State createState() => _CardState(); -} - -class _CardState extends State<_Card> { - bool _isFavourite = false; - - void toggleIsFavourite() { - setState(() { - _isFavourite = !_isFavourite; - }); - - widget.onLike?.call(_isFavourite - ? "Property liked me" - : "Property has been removed from the likes"); - } - - @override - Widget build(BuildContext context) { - return GestureDetector( - onTap: widget.onTap, - child: Container( - width: double.infinity, - padding: - const EdgeInsets.only(top: 15, bottom: 15, left: 30, right: 30), - decoration: BoxDecoration( - border: Border.all(color: Colors.black12, width: 2), - color: Colors.blue, - borderRadius: BorderRadius.circular(20)), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.start, // Выравниваем по левому краю - children: [ - GestureDetector( - onTap: toggleIsFavourite, - child: AnimatedSwitcher( - duration: const Duration(milliseconds: 200), - child: _isFavourite - ? const Icon( - Icons.favorite, - color: Colors.red, - key: ValueKey(0), - ) - : const Icon( - Icons.favorite_border, - color: Colors.red, - key: ValueKey(1), - ), - ), - ) - ], - ), - const SizedBox(height: 20), - Center( - child: ClipRRect( - borderRadius: BorderRadius.circular(20.0), - // Радиус скругления - child: Image.network( - widget.image, - width: 280, // Ширина изображения - height: 350, // Высота изображения - fit: BoxFit.cover - )// Позволяет изображению подстраиваться под рамки), - ), - ), - Padding( - padding: const EdgeInsets.only(top: 50), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(widget.name, style: TextStyle(fontSize: 17)), - Text("Местоположение: ${widget.location}", - style: TextStyle(fontSize: 15)), - Text("${widget.description}", - style: TextStyle(fontSize: 17, color: Colors.orange)) - ], - ), - ) - ], - ), - ), - ); - } -} \ No newline at end of file diff --git a/lib/home_page/home_page.dart b/lib/home_page/home_page.dart deleted file mode 100644 index 6ac66d0..0000000 --- a/lib/home_page/home_page.dart +++ /dev/null @@ -1,157 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:pmd/utils/debounce.dart'; -import 'package:pmd/home_page/bloc/bloc.dart'; -import 'package:pmd/home_page/bloc/events.dart'; -import 'package:pmd/home_page/bloc/state.dart'; -import 'package:pmd/models/card_data.dart'; -import 'package:pmd/details_page/details_page.dart'; -import 'package:pmd/data/repositories/api_interface.dart'; - -import 'package:pmd/data/repositories/mock_repository.dart'; -import '../data/repositories/potter_repository.dart'; - -part 'card.dart'; - -class MyHomePage extends StatefulWidget { - const MyHomePage({super.key, required this.title}); - - final String title; - - @override - State createState() => _MyHomePageState(); -} - -class _MyHomePageState extends State { - final TextEditingController _searchController = TextEditingController(); - final _scrollController = ScrollController(); - - @override - void initState() { - WidgetsBinding.instance.addPostFrameCallback((_) { - context.read().add(const HomeLoadDataEvent()); - }); - - _scrollController.addListener(_onNextPageListener); - super.initState(); - } - - @override - void dispose() { - _searchController.dispose(); - _scrollController.dispose(); - super.dispose(); - } - - void _onNextPageListener() { - if (_scrollController.offset >= - _scrollController.position.maxScrollExtent) { - final bloc = context.read(); - if (!bloc.state.isPaginationLoading) { - bloc.add(HomeLoadDataEvent( - search: _searchController.text, - nextPage: bloc.state.data?.nextPage)); - } - } - } - - Future _onRefresh() { - context - .read() - .add(HomeLoadDataEvent(search: _searchController.text)); - - return Future.value(null); - } - - void _onSearchInputChange(search) { - Debounce.run( - action: () => - context.read().add(HomeLoadDataEvent(search: search))); - } - - void _showSnackBar(BuildContext context, String text) { - WidgetsBinding.instance.addPostFrameCallback((_) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text(text), - duration: const Duration(seconds: 2), - backgroundColor: Colors.black54, - )); - }); - } - - void _navigateToDetailsPage(BuildContext context, CardData data) { - Navigator.push( - context, - CupertinoPageRoute(builder: (context) => DetailsPage(data: data)), - ); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - backgroundColor: Theme.of(context).colorScheme.inversePrimary, - title: Text(widget.title), - ), - body: Column( - children: [ - Padding( - padding: - const EdgeInsets.only(right: 30, left: 30, top: 20, bottom: 20), - child: CupertinoSearchTextField( - controller: _searchController, - onChanged: _onSearchInputChange, - ), - ), - BlocBuilder( - builder: (context, state) => state.error != null - ? Text( - state.error ?? "", - style: Theme.of(context) - .textTheme - .headlineSmall - ?.copyWith(color: Colors.red), - ) - : state.isLoading - ? const Padding( - padding: EdgeInsets.only(top: 20), - child: CircularProgressIndicator(), - ) - : Expanded( - child: RefreshIndicator( - onRefresh: _onRefresh, - child: ListView.separated( - controller: _scrollController, - padding: const EdgeInsets.symmetric( - vertical: 20, horizontal: 30), - separatorBuilder: (context, index) => - const SizedBox(height: 20), - itemCount: state.data?.data?.length ?? 0, - itemBuilder: (context, index) { - final data = state.data?.data?[index]; - - return data == null - ? const SizedBox.shrink() - : _Card.fromData( - data, - onLike: (String text) => - _showSnackBar(context, text), - onTap: () => - _navigateToDetailsPage(context, data), - ); - }, - ), - ), - ), - ), - BlocBuilder( - builder: (context, state) => state.isPaginationLoading - ? const CircularProgressIndicator() - : const SizedBox.shrink(), - ), - ], - ), - ); - } -} diff --git a/lib/main.dart b/lib/main.dart index 9c3c7fc..b98e7da 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,9 +1,15 @@ +import 'dart:io'; + import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmd/components/locale/l10n/app_locale.dart'; import 'package:pmd/data/repositories/mock_repository.dart'; import 'package:pmd/data/repositories/potter_repository.dart'; -import 'package:pmd/home_page/bloc/bloc.dart'; -import 'package:pmd/home_page/home_page.dart'; +import 'package:pmd/presentation/bloc/bloc.dart'; +import 'package:pmd/presentation/home_page/home_page.dart'; +import 'package:pmd/presentation/home_page/like_bloc/like_bloc.dart'; +import 'package:pmd/presentation/home_page/locale_bloc/locale_bloc.dart'; +import 'package:pmd/presentation/home_page/locale_bloc/locale_state.dart'; void main() { runApp(const MyApp()); @@ -14,21 +20,36 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return MaterialApp( - title: 'Flutter Demo', - debugShowCheckedModeBanner: false, - theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), - useMaterial3: true, - ), - home: RepositoryProvider( - lazy: true, - create: (_) => PotterRepository(), - child: BlocProvider( - lazy: false, - create: (context) => HomeBloc(context.read()), - child: const MyHomePage(title: 'Laboratory 6: Architecture (Debounce and Bloc)'), - ), + return BlocProvider( + lazy: false, + create: (context) => LocaleBloc(Locale(Platform.localeName)), + child: BlocBuilder( + builder: (context, state) { + return MaterialApp( + title: 'Flutter Demo', + debugShowCheckedModeBanner: false, + locale: state.currentLocale, + localizationsDelegates: AppLocale.localizationsDelegates, + supportedLocales: AppLocale.supportedLocales, + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.orangeAccent), + useMaterial3: true, + ), + home: RepositoryProvider( + lazy: true, + create: (_) => PotterRepository(), + child: BlocProvider( + lazy: false, + create: (context) => LikeBloc(), + child: BlocProvider( + lazy: false, + create: (context) => HomeBloc(context.read()), + child: const MyHomePage( + title: 'Laboratory 7: Internationalization and Localization')), + ), + ), + ); + }, ), ); } diff --git a/lib/models/card_data.dart b/lib/models/card_data.dart index 7ee8185..1c6555c 100644 --- a/lib/models/card_data.dart +++ b/lib/models/card_data.dart @@ -3,7 +3,12 @@ class CardData { final String location; final String image; final String description; + final String? id; - const CardData({required this.name, required this.location, - required this.image, required this.description}); -} \ No newline at end of file + const CardData( + {required this.id, + required this.name, + required this.location, + required this.image, + required this.description}); +} diff --git a/lib/models/home_data.dart b/lib/models/home_data.dart index 76d9a41..32cafdd 100644 --- a/lib/models/home_data.dart +++ b/lib/models/home_data.dart @@ -5,4 +5,4 @@ class HomeData { final int? nextPage; HomeData({this.data, this.nextPage}); -} \ No newline at end of file +} diff --git a/lib/home_page/bloc/bloc.dart b/lib/presentation/bloc/bloc.dart similarity index 71% rename from lib/home_page/bloc/bloc.dart rename to lib/presentation/bloc/bloc.dart index 8458427..46f37e6 100644 --- a/lib/home_page/bloc/bloc.dart +++ b/lib/presentation/bloc/bloc.dart @@ -1,8 +1,8 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:pmd/data/repositories/mock_repository.dart'; import 'package:pmd/data/repositories/potter_repository.dart'; -import 'package:pmd/home_page/bloc/events.dart'; -import 'package:pmd/home_page/bloc/state.dart'; +import 'package:pmd/presentation/bloc/events.dart'; +import 'package:pmd/presentation/bloc/state.dart'; class HomeBloc extends Bloc { final PotterRepository repository; @@ -13,8 +13,7 @@ class HomeBloc extends Bloc { on(_onLoadData); } - Future _onLoadData( - HomeLoadDataEvent event, Emitter emit) async { + Future _onLoadData(HomeLoadDataEvent event, Emitter emit) async { if (event.nextPage == null) { emit(state.copyWith(isLoading: true)); } else { @@ -30,10 +29,6 @@ class HomeBloc extends Bloc { data?.data?.insertAll(0, state.data?.data ?? []); } - emit(state.copyWith( - isLoading: false, - isPaginationLoading: false, - data: data, - error: error)); + emit(state.copyWith(isLoading: false, isPaginationLoading: false, data: data, error: error)); } } diff --git a/lib/home_page/bloc/events.dart b/lib/presentation/bloc/events.dart similarity index 99% rename from lib/home_page/bloc/events.dart rename to lib/presentation/bloc/events.dart index 025c2b0..cefba70 100644 --- a/lib/home_page/bloc/events.dart +++ b/lib/presentation/bloc/events.dart @@ -7,4 +7,4 @@ class HomeLoadDataEvent extends HomeEvent { final int? nextPage; const HomeLoadDataEvent({this.search, this.nextPage}); -} \ No newline at end of file +} diff --git a/lib/home_page/bloc/state.dart b/lib/presentation/bloc/state.dart similarity index 74% rename from lib/home_page/bloc/state.dart rename to lib/presentation/bloc/state.dart index 74b0777..ad0d568 100644 --- a/lib/home_page/bloc/state.dart +++ b/lib/presentation/bloc/state.dart @@ -8,17 +8,10 @@ class HomeState extends Equatable { final String? error; const HomeState( - {this.data, - this.isLoading = false, - this.isPaginationLoading = false, - this.error}); + {this.data, this.isLoading = false, this.isPaginationLoading = false, this.error}); // Получение нового экземпляра состояния - HomeState copyWith( - {HomeData? data, - bool? isLoading, - bool? isPaginationLoading, - String? error}) => + HomeState copyWith({HomeData? data, bool? isLoading, bool? isPaginationLoading, String? error}) => HomeState( data: data ?? this.data, isLoading: isLoading ?? this.isLoading, diff --git a/lib/presentation/common/svg_objects.dart b/lib/presentation/common/svg_objects.dart new file mode 100644 index 0000000..9ce149b --- /dev/null +++ b/lib/presentation/common/svg_objects.dart @@ -0,0 +1,35 @@ +import 'package:flutter/widgets.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:pmd/components/resources.g.dart'; + +abstract class SvgObjects { + static void init() { + final pics = [ + R.ASSETS_SVG_RU_SVG, + R.ASSETS_SVG_UK_SVG, + ]; + + for (final String p in pics) { + final loader = SvgAssetLoader(p); + svg.cache.putIfAbsent(loader.cacheKey(null), () => loader.loadBytes(null)); + } + } +} + +class SvgRu extends StatelessWidget { + const SvgRu({super.key}); + + @override + Widget build(BuildContext context) { + return SvgPicture.asset(R.ASSETS_SVG_RU_SVG); + } +} + +class SvgUk extends StatelessWidget { + const SvgUk({super.key}); + + @override + Widget build(BuildContext context) { + return SvgPicture.asset(R.ASSETS_SVG_UK_SVG); + } +} diff --git a/lib/details_page/details_page.dart b/lib/presentation/details_page/details_page.dart similarity index 100% rename from lib/details_page/details_page.dart rename to lib/presentation/details_page/details_page.dart diff --git a/lib/presentation/home_page/card.dart b/lib/presentation/home_page/card.dart new file mode 100644 index 0000000..484d849 --- /dev/null +++ b/lib/presentation/home_page/card.dart @@ -0,0 +1,107 @@ +part of "home_page.dart"; + +typedef OnLikeCallback = void Function(String? id, String text, bool isLiked); + +class Card extends StatelessWidget { + final String? id; + final String name; + final String location; + final String image; + final String description; + final bool isLiked; + + final OnLikeCallback? onLike; + final VoidCallback? onTap; + + const Card({ + super.key, + required this.id, + required this.name, + required this.location, + required this.image, + required this.description, + required this.onLike, + required this.onTap, + this.isLiked = false, + }); + + factory Card.fromData(CardData data, + {OnLikeCallback? onLike, VoidCallback? onTap, bool isLiked = false}) => + Card( + id: data.id, + name: data.name, + location: data.location, + image: data.image, + description: data.description, + isLiked: isLiked, + onLike: onLike, + onTap: onTap); + + @override + Widget build(BuildContext context) { + void toggleIsFavourite() { + onLike?.call(id, !isLiked ? context.locale.cardLiked : context.locale.cardDisliked, isLiked); + } + + return GestureDetector( + onTap: onTap, + child: Container( + width: double.infinity, + padding: const EdgeInsets.only(top: 15, bottom: 15, left: 30, right: 30), + decoration: BoxDecoration( + border: Border.all(color: Colors.black12, width: 2), + color: Colors.blue, + borderRadius: BorderRadius.circular(20)), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.start, // Выравниваем по левому краю + children: [ + GestureDetector( + onTap: toggleIsFavourite, + child: AnimatedSwitcher( + duration: const Duration(milliseconds: 200), + child: isLiked + ? const Icon( + Icons.favorite, + color: Colors.red, + key: ValueKey(0), + ) + : const Icon( + Icons.favorite_border, + color: Colors.red, + key: ValueKey(1), + ), + ), + ) + ], + ), + const SizedBox(height: 20), + Center( + child: ClipRRect( + borderRadius: BorderRadius.circular(20.0), + // Радиус скругления + child: Image.network(image, + width: 280, // Ширина изображения + height: 350, // Высота изображения + fit: BoxFit.cover) // Позволяет изображению подстраиваться под рамки), + ), + ), + Padding( + padding: const EdgeInsets.only(top: 50), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(name, style: TextStyle(fontSize: 17)), + Text("Местоположение: ${location}", style: TextStyle(fontSize: 15)), + Text("${description}", style: TextStyle(fontSize: 17, color: Colors.orange)) + ], + ), + ) + ], + ), + ), + ); + } +} diff --git a/lib/presentation/home_page/home_page.dart b/lib/presentation/home_page/home_page.dart new file mode 100644 index 0000000..f004afa --- /dev/null +++ b/lib/presentation/home_page/home_page.dart @@ -0,0 +1,190 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmd/components/extensions/local_context_x.dart'; +import 'package:pmd/components/utils/debounce.dart'; +import 'package:pmd/models/card_data.dart'; +import 'package:pmd/presentation/bloc/bloc.dart'; +import 'package:pmd/presentation/bloc/events.dart'; +import 'package:pmd/presentation/bloc/state.dart'; +import 'package:pmd/presentation/common/svg_objects.dart'; +import 'package:pmd/presentation/details_page/details_page.dart'; +import 'package:pmd/presentation/home_page/like_bloc/like_bloc.dart'; +import 'package:pmd/presentation/home_page/like_bloc/like_event.dart'; +import 'package:pmd/presentation/home_page/like_bloc/like_state.dart'; +import 'package:pmd/presentation/home_page/locale_bloc/locale_bloc.dart'; +import 'package:pmd/presentation/home_page/locale_bloc/locale_events.dart'; +import 'package:pmd/presentation/home_page/locale_bloc/locale_state.dart'; + +part 'card.dart'; + +class MyHomePage extends StatefulWidget { + const MyHomePage({super.key, required this.title}); + + final String title; + + @override + State createState() => _MyHomePageState(); +} + +class _MyHomePageState extends State { + final TextEditingController _searchController = TextEditingController(); + final _scrollController = ScrollController(); + + @override + void initState() { + WidgetsBinding.instance.addPostFrameCallback((_) { + context.read().add(const HomeLoadDataEvent()); + context.read().add(const LoadLikesEvent()); + }); + + _scrollController.addListener(_onNextPageListener); + SvgObjects.init(); + + super.initState(); + } + + @override + void dispose() { + _searchController.dispose(); + _scrollController.dispose(); + super.dispose(); + } + + void _onNextPageListener() { + if (_scrollController.offset >= _scrollController.position.maxScrollExtent) { + final bloc = context.read(); + if (!bloc.state.isPaginationLoading) { + bloc.add( + HomeLoadDataEvent(search: _searchController.text, nextPage: bloc.state.data?.nextPage)); + } + } + } + + Future _onRefresh() { + context.read().add(HomeLoadDataEvent(search: _searchController.text)); + return Future.value(null); + } + + void _onSearchInputChange(search) { + Debounce.run(action: () => context.read().add(HomeLoadDataEvent(search: search))); + } + + void _onLike(String? id, String text, bool isLiked) { + if (id != null) { + context.read().add(ChangeLikeEvent(id)); + _showSnackBar(context, id, text, isLiked); + } + } + + void _showSnackBar(BuildContext context, String? id, String text, bool isLiked) { + WidgetsBinding.instance.addPostFrameCallback((_) { + ScaffoldMessenger.of(context).showSnackBar(SnackBar( + content: Text(text), + duration: const Duration(seconds: 2), + backgroundColor: Colors.black54, + )); + }); + } + + void _navigateToDetailsPage(BuildContext context, CardData data) { + Navigator.push( + context, + CupertinoPageRoute(builder: (context) => DetailsPage(data: data)), + ); + } + + void _handleLocaleButtonTap() { + context.read().add(const ChangeLocaleEvent()); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + backgroundColor: Theme.of(context).colorScheme.inversePrimary, + title: Text(widget.title), + ), + body: Column( + children: [ + Padding( + padding: const EdgeInsets.only(right: 30, left: 30, top: 20, bottom: 20), + child: Row( + children: [ + Expanded( + flex: 4, + child: CupertinoSearchTextField( + controller: _searchController, + placeholder: context.locale.searchInputPlaceholder, + onChanged: _onSearchInputChange, + )), + GestureDetector( + onTap: _handleLocaleButtonTap, + child: SizedBox.square( + dimension: 50, + child: Padding( + padding: const EdgeInsets.only(left: 12), + child: BlocBuilder( + builder: (context, state) { + return state.currentLocale.languageCode == "ru" + ? const SvgRu() + : const SvgUk(); + }, + ), + ), + ), + ), + ], + ), + ), + BlocBuilder( + builder: (context, state) => state.error != null + ? Text( + state.error ?? "", + style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red), + ) + : state.isLoading + ? const Padding( + padding: EdgeInsets.only(top: 20), + child: CircularProgressIndicator(), + ) + : BlocBuilder( + builder: (context, likeState) { + return Expanded( + child: RefreshIndicator( + onRefresh: _onRefresh, + child: ListView.separated( + controller: _scrollController, + padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 30), + separatorBuilder: (context, index) => const SizedBox(height: 20), + itemCount: state.data?.data?.length ?? 0, + itemBuilder: (context, index) { + final data = state.data?.data?[index]; + + return data == null + ? const SizedBox.shrink() + : Card.fromData( + data, + isLiked: likeState.likedIds?.contains(data.id) == true, + onLike: (String? id, String text, bool isLiked) => + _onLike(id, text, isLiked), + onTap: () => _navigateToDetailsPage(context, data), + ); + }, + ), + ), + ); + }, + ), + ), + BlocBuilder( + builder: (context, state) => state.isPaginationLoading + ? const CircularProgressIndicator() + : const SizedBox.shrink(), + ), + ], + ), + ); + } +} diff --git a/lib/presentation/home_page/like_bloc/like_bloc.dart b/lib/presentation/home_page/like_bloc/like_bloc.dart new file mode 100644 index 0000000..57293b8 --- /dev/null +++ b/lib/presentation/home_page/like_bloc/like_bloc.dart @@ -0,0 +1,35 @@ +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmd/presentation/home_page/like_bloc/like_event.dart'; +import 'package:pmd/presentation/home_page/like_bloc/like_state.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +const String _likedPrefsKey = 'liked'; + +class LikeBloc extends Bloc { + LikeBloc() : super(const LikeState(likedIds: [])) { + on(_onChangeLike); + on(_onLoadLikes); + } + + Future _onLoadLikes(LoadLikesEvent event, Emitter emit) async { + final prefs = await SharedPreferences.getInstance(); + final data = prefs.getStringList(_likedPrefsKey); + + emit(state.copyWith(likedIds: data)); + } + + Future _onChangeLike(ChangeLikeEvent event, Emitter emit) async { + final updatedList = List.from(state.likedIds ?? []); + + if (updatedList.contains(event.id)) { + updatedList.remove(event.id); + } else { + updatedList.add(event.id); + } + + final prefs = await SharedPreferences.getInstance(); + prefs.setStringList(_likedPrefsKey, updatedList); + + emit(state.copyWith(likedIds: updatedList)); + } +} diff --git a/lib/presentation/home_page/like_bloc/like_event.dart b/lib/presentation/home_page/like_bloc/like_event.dart new file mode 100644 index 0000000..d0326d8 --- /dev/null +++ b/lib/presentation/home_page/like_bloc/like_event.dart @@ -0,0 +1,13 @@ +abstract class LikeEvent { + const LikeEvent(); +} + +class LoadLikesEvent extends LikeEvent { + const LoadLikesEvent(); +} + +class ChangeLikeEvent extends LikeEvent { + final String id; + + const ChangeLikeEvent(this.id); +} diff --git a/lib/presentation/home_page/like_bloc/like_state.dart b/lib/presentation/home_page/like_bloc/like_state.dart new file mode 100644 index 0000000..5f0959f --- /dev/null +++ b/lib/presentation/home_page/like_bloc/like_state.dart @@ -0,0 +1,14 @@ +import 'package:copy_with_extension/copy_with_extension.dart'; +import 'package:equatable/equatable.dart'; + +part 'like_state.g.dart'; + +@CopyWith() +class LikeState extends Equatable { + final List? likedIds; + + const LikeState({required this.likedIds}); + + @override + List get props => [likedIds]; +} diff --git a/lib/presentation/home_page/locale_bloc/locale_bloc.dart b/lib/presentation/home_page/locale_bloc/locale_bloc.dart new file mode 100644 index 0000000..cbf3f0e --- /dev/null +++ b/lib/presentation/home_page/locale_bloc/locale_bloc.dart @@ -0,0 +1,18 @@ +import 'dart:ui'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:pmd/components/locale/l10n/app_locale.dart'; +import 'package:pmd/presentation/home_page/locale_bloc/locale_events.dart'; +import 'package:pmd/presentation/home_page/locale_bloc/locale_state.dart'; + +class LocaleBloc extends Bloc { + LocaleBloc(Locale defaultLocale) : super(LocaleState(currentLocale: defaultLocale)) { + on(_onChangeLocale); + } + + Future _onChangeLocale(ChangeLocaleEvent event, Emitter emit) async { + final toChange = AppLocale.supportedLocales + .firstWhere((e) => e.languageCode != state.currentLocale.languageCode); + + emit(state.copyWith(currentLocale: toChange)); + } +} diff --git a/lib/presentation/home_page/locale_bloc/locale_events.dart b/lib/presentation/home_page/locale_bloc/locale_events.dart new file mode 100644 index 0000000..c08cd1b --- /dev/null +++ b/lib/presentation/home_page/locale_bloc/locale_events.dart @@ -0,0 +1,7 @@ +abstract class LocaleEvent { + const LocaleEvent(); +} + +class ChangeLocaleEvent extends LocaleEvent { + const ChangeLocaleEvent(); +} diff --git a/lib/presentation/home_page/locale_bloc/locale_state.dart b/lib/presentation/home_page/locale_bloc/locale_state.dart new file mode 100644 index 0000000..b9221ca --- /dev/null +++ b/lib/presentation/home_page/locale_bloc/locale_state.dart @@ -0,0 +1,15 @@ +import 'package:copy_with_extension/copy_with_extension.dart'; +import 'package:equatable/equatable.dart'; +import 'package:flutter/material.dart'; + +part 'locale_state.g.dart'; + +@CopyWith() +class LocaleState extends Equatable { + final Locale currentLocale; + + const LocaleState({required this.currentLocale}); + + @override + List get props => [currentLocale]; +} diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index cccf817..724bb2a 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,6 +5,8 @@ import FlutterMacOS import Foundation +import shared_preferences_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) } diff --git a/makefile b/makefile new file mode 100644 index 0000000..3ff7e0d --- /dev/null +++ b/makefile @@ -0,0 +1,26 @@ +gen: + flutter pub run build_runner build --delete-conflicting-outputs + +hello: + echo "Hello, user"; \ + echo "uraaa, makefile working"; \ + echo "^_^" + +icon: + flutter pub run flutter_launcher_icons:main + +init_res: + dart pub global activate flutter_asset_generator + +format: + dart format . --line-length 100 + +res: + dart pub global activate fgen + fgen --output lib/components/resources.g.dart --no-watch --no-preview; \ + make format + +loc: + flutter gen-l10n; \ + make format + diff --git a/pubspec.lock b/pubspec.lock index 85cd7f9..8215779 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -22,6 +22,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.7.0" + archive: + dependency: transitive + description: + name: archive + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + url: "https://pub.dev" + source: hosted + version: "3.6.1" args: dependency: transitive description: @@ -134,6 +142,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 + url: "https://pub.dev" + source: hosted + version: "0.4.1" clock: dependency: transitive description: @@ -166,6 +182,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.1" + copy_with_extension: + dependency: transitive + description: + name: copy_with_extension + sha256: fbcf890b0c34aedf0894f91a11a579994b61b4e04080204656b582708b5b1125 + url: "https://pub.dev" + source: hosted + version: "5.0.4" + copy_with_extension_gen: + dependency: "direct main" + description: + name: copy_with_extension_gen + sha256: "51cd11094096d40824c8da629ca7f16f3b7cea5fc44132b679617483d43346b0" + url: "https://pub.dev" + source: hosted + version: "5.0.4" crypto: dependency: transitive description: @@ -222,6 +254,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + url: "https://pub.dev" + source: hosted + version: "2.1.3" file: dependency: transitive description: @@ -251,6 +291,14 @@ packages: url: "https://pub.dev" source: hosted version: "8.1.6" + flutter_launcher_icons: + dependency: "direct dev" + description: + name: flutter_launcher_icons + sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + url: "https://pub.dev" + source: hosted + version: "0.13.1" flutter_lints: dependency: "direct dev" description: @@ -259,11 +307,29 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: "8c5d68a82add3ca76d792f058b186a0599414f279f00ece4830b9b231b570338" + url: "https://pub.dev" + source: hosted + version: "2.0.7" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" frontend_server_client: dependency: transitive description: @@ -288,6 +354,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.2" + http: + dependency: transitive + description: + name: http + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + url: "https://pub.dev" + source: hosted + version: "1.2.2" http_multi_server: dependency: transitive description: @@ -304,14 +378,22 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" + url: "https://pub.dev" + source: hosted + version: "4.2.0" intl: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" io: dependency: transitive description: @@ -448,6 +530,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" + source: hosted + version: "1.0.1" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + url: "https://pub.dev" + source: hosted + version: "6.0.2" + platform: + dependency: transitive + description: + name: platform + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + url: "https://pub.dev" + source: hosted + version: "3.1.5" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" pool: dependency: transitive description: @@ -488,6 +626,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + url: "https://pub.dev" + source: hosted + version: "2.2.3" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f + url: "https://pub.dev" + source: hosted + version: "2.5.2" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e + url: "https://pub.dev" + source: hosted + version: "2.4.2" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" + source: hosted + version: "2.4.1" shelf: dependency: transitive description: @@ -597,6 +791,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" vector_math: dependency: transitive description: @@ -645,6 +863,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + url: "https://pub.dev" + source: hosted + version: "1.0.4" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" yaml: dependency: transitive description: @@ -655,4 +889,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.5.3 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 2f4560c..f56d333 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,11 +32,12 @@ dependencies: sdk: flutter provider: ^6.0.0 - intl: ^0.18.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. + # Виджеты cupertino_icons: ^1.0.8 + flutter_svg: 2.0.7 # Для Json json_annotation: ^4.8.1 @@ -46,6 +47,15 @@ dependencies: # Bloc (business logical component) flutter_bloc: ^8.1.5 equatable: ^2.0.5 + copy_with_extension_gen: ^5.0.4 + + # Localization + flutter_localizations: + sdk: flutter + + intl: ^0.19.0 + + shared_preferences: 2.2.3 dev_dependencies: flutter_test: @@ -58,10 +68,20 @@ dev_dependencies: # rules and activating additional ones. flutter_lints: ^4.0.0 + # Иконки!!! + flutter_launcher_icons: 0.13.1 + # Добавляем JSON и добавляем зависимость от http + # Сетевое взаимодействие build_runner: ^2.4.9 json_serializable: ^6.7.1 +flutter_icons: + android: "ic_launcher" + ios: true + image_path: "assets/house.jpg" + min_sdk_android: 21 + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec @@ -72,7 +92,10 @@ flutter: # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true + generate: true + assets: + - assets/svg/ # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg