laboratory_7 (URAAAAA, THIS POBEDAA ^_^)
This commit is contained in:
nikbel2004@outlook.com
parent
fb76d00505
commit
775dde219a
Binary file not shown.
|
Before Width: | Height: | Size: 544 B After Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 442 B After Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 721 B After Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 7.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 11 KiB |
BIN
assets/house.jpg
Normal file
BIN
assets/house.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 197 KiB |
19
assets/svg/ru.svg
Normal file
19
assets/svg/ru.svg
Normal file
@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
|
||||
<svg width="800px" height="800px" viewBox="0 -4 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g clip-path="url(#clip0_503_2726)">
|
||||
<rect x="0.25" y="0.25" width="27.5" height="19.5" rx="1.75" fill="white" stroke="#F5F5F5" stroke-width="0.5"/>
|
||||
<mask id="mask0_503_2726" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="28" height="20">
|
||||
<rect x="0.25" y="0.25" width="27.5" height="19.5" rx="1.75" fill="white" stroke="white" stroke-width="0.5"/>
|
||||
</mask>
|
||||
<g mask="url(#mask0_503_2726)">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M0 13.3333H28V6.66667H0V13.3333Z" fill="#0C47B7"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M0 20H28V13.3333H0V20Z" fill="#E53B35"/>
|
||||
</g>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_503_2726">
|
||||
<rect width="28" height="20" rx="2" fill="white"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 968 B |
23
assets/svg/uk.svg
Normal file
23
assets/svg/uk.svg
Normal file
@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
|
||||
<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
viewBox="0 0 512 512" xml:space="preserve">
|
||||
<path style="fill:#41479B;" d="M473.655,88.276H38.345C17.167,88.276,0,105.443,0,126.621V385.38
|
||||
c0,21.177,17.167,38.345,38.345,38.345h435.31c21.177,0,38.345-17.167,38.345-38.345V126.621
|
||||
C512,105.443,494.833,88.276,473.655,88.276z"/>
|
||||
<path style="fill:#F5F5F5;" d="M511.469,120.282c-3.022-18.159-18.797-32.007-37.814-32.007h-9.977l-163.54,107.147V88.276h-88.276
|
||||
v107.147L48.322,88.276h-9.977c-19.017,0-34.792,13.847-37.814,32.007l139.778,91.58H0v88.276h140.309L0.531,391.717
|
||||
c3.022,18.159,18.797,32.007,37.814,32.007h9.977l163.54-107.147v107.147h88.276V316.577l163.54,107.147h9.977
|
||||
c19.017,0,34.792-13.847,37.814-32.007l-139.778-91.58H512v-88.276H371.691L511.469,120.282z"/>
|
||||
<g>
|
||||
<polygon style="fill:#FF4B55;" points="282.483,88.276 229.517,88.276 229.517,229.517 0,229.517 0,282.483 229.517,282.483
|
||||
229.517,423.724 282.483,423.724 282.483,282.483 512,282.483 512,229.517 282.483,229.517 "/>
|
||||
<path style="fill:#FF4B55;" d="M24.793,421.252l186.583-121.114h-32.428L9.224,410.31
|
||||
C13.377,415.157,18.714,418.955,24.793,421.252z"/>
|
||||
<path style="fill:#FF4B55;" d="M346.388,300.138H313.96l180.716,117.305c5.057-3.321,9.277-7.807,12.287-13.075L346.388,300.138z"
|
||||
/>
|
||||
<path style="fill:#FF4B55;" d="M4.049,109.475l157.73,102.387h32.428L15.475,95.842C10.676,99.414,6.749,104.084,4.049,109.475z"/>
|
||||
<path style="fill:#FF4B55;" d="M332.566,211.862l170.035-110.375c-4.199-4.831-9.578-8.607-15.699-10.86L300.138,211.862H332.566z"
|
||||
/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.7 KiB |
@ -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++";
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 125 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 295 B After Width: | Height: | Size: 711 B |
Binary file not shown.
|
Before Width: | Height: | Size: 406 B After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 450 B After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 282 B After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 462 B After Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 704 B After Width: | Height: | Size: 4.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 406 B After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 586 B After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 862 B After Width: | Height: | Size: 6.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 862 B After Width: | Height: | Size: 6.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 762 B After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 8.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 9.5 KiB |
6
l10n.yaml
Normal file
6
l10n.yaml
Normal file
@ -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
|
||||
7
l10n/app_en.arb
Normal file
7
l10n/app_en.arb
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
"@@locale": "en",
|
||||
|
||||
"cardLiked": "Card added to your favorite :)",
|
||||
"cardDisliked": "Card deleted from favourite :(",
|
||||
"searchInputPlaceholder": "Search .."
|
||||
}
|
||||
7
l10n/app_ru.arb
Normal file
7
l10n/app_ru.arb
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
"@@locale": "ru",
|
||||
|
||||
"cardLiked": "Добавлено в понравившиеся :)",
|
||||
"cardDisliked": "Удалено из понравившегося :(",
|
||||
"searchInputPlaceholder": "Поиск .."
|
||||
}
|
||||
6
lib/components/extensions/local_context_x.dart
Normal file
6
lib/components/extensions/local_context_x.dart
Normal file
@ -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)!;
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
@ -12,8 +12,7 @@ class HousesDto {
|
||||
|
||||
const HousesDto({this.data, this.meta});
|
||||
|
||||
factory HousesDto.fromJson(Map<String, dynamic> json) =>
|
||||
_$HousesDtoFromJson(json);
|
||||
factory HousesDto.fromJson(Map<String, dynamic> json) => _$HousesDtoFromJson(json);
|
||||
}
|
||||
|
||||
@JsonSerializable(createToJson: false)
|
||||
@ -22,8 +21,7 @@ class MetaDto {
|
||||
|
||||
const MetaDto({this.pagination});
|
||||
|
||||
factory MetaDto.fromJson(Map<String, dynamic> json) =>
|
||||
_$MetaDtoFromJson(json);
|
||||
factory MetaDto.fromJson(Map<String, dynamic> json) => _$MetaDtoFromJson(json);
|
||||
}
|
||||
|
||||
@JsonSerializable(createToJson: false)
|
||||
@ -34,8 +32,7 @@ class PaginationDto {
|
||||
|
||||
const PaginationDto({this.current, this.last, this.next});
|
||||
|
||||
factory PaginationDto.fromJson(Map<String, dynamic> json) =>
|
||||
_$PaginationDtoFromJson(json);
|
||||
factory PaginationDto.fromJson(Map<String, dynamic> json) => _$PaginationDtoFromJson(json);
|
||||
}
|
||||
|
||||
@JsonSerializable(createToJson: false)
|
||||
@ -45,8 +42,7 @@ class HouseDataDto {
|
||||
|
||||
const HouseDataDto(this.id, this.attributes);
|
||||
|
||||
factory HouseDataDto.fromJson(Map<String, dynamic> json) =>
|
||||
_$HouseDataDtoFromJson(json);
|
||||
factory HouseDataDto.fromJson(Map<String, dynamic> 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<String, dynamic> json) =>
|
||||
_$HouseAttributesDataDtoFromJson(json);
|
||||
|
||||
@ -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);
|
||||
HomeData toDomain() =>
|
||||
HomeData(data: data?.map((e) => e.toDomain()).toList(), nextPage: meta?.pagination?.next);
|
||||
}
|
||||
@ -6,26 +6,31 @@ class MockRepository extends ApiInterface {
|
||||
// Список всех данных
|
||||
final List<CardData> 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",
|
||||
@ -55,7 +60,8 @@ class MockRepository extends ApiInterface {
|
||||
|
||||
// Убедитесь, что индекс не выходит за пределы списка
|
||||
if (startIndex >= filteredData.length) {
|
||||
return HomeData(data: currentData ?? []); // Возвращаем текущие данные, если больше нет данных
|
||||
return HomeData(
|
||||
data: currentData ?? []); // Возвращаем текущие данные, если больше нет данных
|
||||
}
|
||||
|
||||
// Извлекаем нужную страницу данных
|
||||
|
||||
@ -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<HomeData?> 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<dynamic> response = await _dio.get<Map<dynamic, dynamic>>(
|
||||
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<String, dynamic>);
|
||||
final HousesDto dto = HousesDto.fromJson(response.data as Map<String, dynamic>);
|
||||
|
||||
return dto.toDomain();
|
||||
} on DioException catch (e) {
|
||||
|
||||
@ -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<StatefulWidget> 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<int>(0),
|
||||
)
|
||||
: const Icon(
|
||||
Icons.favorite_border,
|
||||
color: Colors.red,
|
||||
key: ValueKey<int>(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))
|
||||
],
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -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<MyHomePage> createState() => _MyHomePageState();
|
||||
}
|
||||
|
||||
class _MyHomePageState extends State<MyHomePage> {
|
||||
final TextEditingController _searchController = TextEditingController();
|
||||
final _scrollController = ScrollController();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
context.read<HomeBloc>().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<HomeBloc>();
|
||||
if (!bloc.state.isPaginationLoading) {
|
||||
bloc.add(HomeLoadDataEvent(
|
||||
search: _searchController.text,
|
||||
nextPage: bloc.state.data?.nextPage));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _onRefresh() {
|
||||
context
|
||||
.read<HomeBloc>()
|
||||
.add(HomeLoadDataEvent(search: _searchController.text));
|
||||
|
||||
return Future.value(null);
|
||||
}
|
||||
|
||||
void _onSearchInputChange(search) {
|
||||
Debounce.run(
|
||||
action: () =>
|
||||
context.read<HomeBloc>().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<HomeBloc, HomeState>(
|
||||
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<HomeBloc, HomeState>(
|
||||
builder: (context, state) => state.isPaginationLoading
|
||||
? const CircularProgressIndicator()
|
||||
: const SizedBox.shrink(),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -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,22 +20,37 @@ class MyApp extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BlocProvider<LocaleBloc>(
|
||||
lazy: false,
|
||||
create: (context) => LocaleBloc(Locale(Platform.localeName)),
|
||||
child: BlocBuilder<LocaleBloc, LocaleState>(
|
||||
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.deepPurple),
|
||||
colorScheme: ColorScheme.fromSeed(seedColor: Colors.orangeAccent),
|
||||
useMaterial3: true,
|
||||
),
|
||||
home: RepositoryProvider<PotterRepository>(
|
||||
lazy: true,
|
||||
create: (_) => PotterRepository(),
|
||||
child: BlocProvider<LikeBloc>(
|
||||
lazy: false,
|
||||
create: (context) => LikeBloc(),
|
||||
child: BlocProvider<HomeBloc>(
|
||||
lazy: false,
|
||||
create: (context) => HomeBloc(context.read<PotterRepository>()),
|
||||
child: const MyHomePage(title: 'Laboratory 6: Architecture (Debounce and Bloc)'),
|
||||
child: const MyHomePage(
|
||||
title: 'Laboratory 7: Internationalization and Localization')),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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});
|
||||
const CardData(
|
||||
{required this.id,
|
||||
required this.name,
|
||||
required this.location,
|
||||
required this.image,
|
||||
required this.description});
|
||||
}
|
||||
@ -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<HomeEvent, HomeState> {
|
||||
final PotterRepository repository;
|
||||
@ -13,8 +13,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
|
||||
on<HomeLoadDataEvent>(_onLoadData);
|
||||
}
|
||||
|
||||
Future<void> _onLoadData(
|
||||
HomeLoadDataEvent event, Emitter<HomeState> emit) async {
|
||||
Future<void> _onLoadData(HomeLoadDataEvent event, Emitter<HomeState> emit) async {
|
||||
if (event.nextPage == null) {
|
||||
emit(state.copyWith(isLoading: true));
|
||||
} else {
|
||||
@ -30,10 +29,6 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
|
||||
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));
|
||||
}
|
||||
}
|
||||
@ -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,
|
||||
35
lib/presentation/common/svg_objects.dart
Normal file
35
lib/presentation/common/svg_objects.dart
Normal file
@ -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 = <String>[
|
||||
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);
|
||||
}
|
||||
}
|
||||
107
lib/presentation/home_page/card.dart
Normal file
107
lib/presentation/home_page/card.dart
Normal file
@ -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<int>(0),
|
||||
)
|
||||
: const Icon(
|
||||
Icons.favorite_border,
|
||||
color: Colors.red,
|
||||
key: ValueKey<int>(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))
|
||||
],
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
190
lib/presentation/home_page/home_page.dart
Normal file
190
lib/presentation/home_page/home_page.dart
Normal file
@ -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<MyHomePage> createState() => _MyHomePageState();
|
||||
}
|
||||
|
||||
class _MyHomePageState extends State<MyHomePage> {
|
||||
final TextEditingController _searchController = TextEditingController();
|
||||
final _scrollController = ScrollController();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
context.read<HomeBloc>().add(const HomeLoadDataEvent());
|
||||
context.read<LikeBloc>().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<HomeBloc>();
|
||||
if (!bloc.state.isPaginationLoading) {
|
||||
bloc.add(
|
||||
HomeLoadDataEvent(search: _searchController.text, nextPage: bloc.state.data?.nextPage));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _onRefresh() {
|
||||
context.read<HomeBloc>().add(HomeLoadDataEvent(search: _searchController.text));
|
||||
return Future.value(null);
|
||||
}
|
||||
|
||||
void _onSearchInputChange(search) {
|
||||
Debounce.run(action: () => context.read<HomeBloc>().add(HomeLoadDataEvent(search: search)));
|
||||
}
|
||||
|
||||
void _onLike(String? id, String text, bool isLiked) {
|
||||
if (id != null) {
|
||||
context.read<LikeBloc>().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<LocaleBloc>().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<LocaleBloc, LocaleState>(
|
||||
builder: (context, state) {
|
||||
return state.currentLocale.languageCode == "ru"
|
||||
? const SvgRu()
|
||||
: const SvgUk();
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
BlocBuilder<HomeBloc, HomeState>(
|
||||
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<LikeBloc, LikeState>(
|
||||
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<HomeBloc, HomeState>(
|
||||
builder: (context, state) => state.isPaginationLoading
|
||||
? const CircularProgressIndicator()
|
||||
: const SizedBox.shrink(),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
35
lib/presentation/home_page/like_bloc/like_bloc.dart
Normal file
35
lib/presentation/home_page/like_bloc/like_bloc.dart
Normal file
@ -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<LikeEvent, LikeState> {
|
||||
LikeBloc() : super(const LikeState(likedIds: [])) {
|
||||
on<ChangeLikeEvent>(_onChangeLike);
|
||||
on<LoadLikesEvent>(_onLoadLikes);
|
||||
}
|
||||
|
||||
Future<void> _onLoadLikes(LoadLikesEvent event, Emitter<LikeState> emit) async {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
final data = prefs.getStringList(_likedPrefsKey);
|
||||
|
||||
emit(state.copyWith(likedIds: data));
|
||||
}
|
||||
|
||||
Future<void> _onChangeLike(ChangeLikeEvent event, Emitter<LikeState> emit) async {
|
||||
final updatedList = List<String>.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));
|
||||
}
|
||||
}
|
||||
13
lib/presentation/home_page/like_bloc/like_event.dart
Normal file
13
lib/presentation/home_page/like_bloc/like_event.dart
Normal file
@ -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);
|
||||
}
|
||||
14
lib/presentation/home_page/like_bloc/like_state.dart
Normal file
14
lib/presentation/home_page/like_bloc/like_state.dart
Normal file
@ -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<String>? likedIds;
|
||||
|
||||
const LikeState({required this.likedIds});
|
||||
|
||||
@override
|
||||
List<Object?> get props => [likedIds];
|
||||
}
|
||||
18
lib/presentation/home_page/locale_bloc/locale_bloc.dart
Normal file
18
lib/presentation/home_page/locale_bloc/locale_bloc.dart
Normal file
@ -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<LocaleEvent, LocaleState> {
|
||||
LocaleBloc(Locale defaultLocale) : super(LocaleState(currentLocale: defaultLocale)) {
|
||||
on<ChangeLocaleEvent>(_onChangeLocale);
|
||||
}
|
||||
|
||||
Future<void> _onChangeLocale(ChangeLocaleEvent event, Emitter<LocaleState> emit) async {
|
||||
final toChange = AppLocale.supportedLocales
|
||||
.firstWhere((e) => e.languageCode != state.currentLocale.languageCode);
|
||||
|
||||
emit(state.copyWith(currentLocale: toChange));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
abstract class LocaleEvent {
|
||||
const LocaleEvent();
|
||||
}
|
||||
|
||||
class ChangeLocaleEvent extends LocaleEvent {
|
||||
const ChangeLocaleEvent();
|
||||
}
|
||||
15
lib/presentation/home_page/locale_bloc/locale_state.dart
Normal file
15
lib/presentation/home_page/locale_bloc/locale_state.dart
Normal file
@ -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<Object?> get props => [currentLocale];
|
||||
}
|
||||
@ -5,6 +5,8 @@
|
||||
import FlutterMacOS
|
||||
import Foundation
|
||||
|
||||
import shared_preferences_foundation
|
||||
|
||||
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
||||
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
|
||||
}
|
||||
|
||||
26
makefile
Normal file
26
makefile
Normal file
@ -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
|
||||
|
||||
240
pubspec.lock
240
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"
|
||||
|
||||
25
pubspec.yaml
25
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user