3 Commits
lab6 ... lab7

Author SHA1 Message Date
07cf30d73c final 2024-12-21 19:46:24 +04:00
64d1ad6cf3 для курсача 2024-12-20 20:22:37 +04:00
fb6de303b3 lab7 2024-12-17 14:49:38 +04:00
43 changed files with 903 additions and 177 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 544 B

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 442 B

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 721 B

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 34 KiB

BIN
assets/cat.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 169 KiB

BIN
assets/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

BIN
assets/iconcool.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 645 KiB

19
assets/svg/ru.svg Normal file
View 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>

After

Width:  |  Height:  |  Size: 968 B

7
assets/svg/uk.svg Normal file
View File

@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb" viewBox="0 0 640 480">
<path fill="#012169" d="M0 0h640v480H0z"/>
<path fill="#FFF" d="m75 0 244 181L562 0h78v62L400 241l240 178v61h-80L320 301 81 480H0v-60l239-178L0 64V0z"/>
<path fill="#C8102E" d="m424 281 216 159v40L369 281zm-184 20 6 35L54 480H0zM640 0v3L391 191l2-44L590 0zM0 0l239 176h-60L0 42z"/>
<path fill="#FFF" d="M241 0v480h160V0zM0 160v160h640V160z"/>
<path fill="#C8102E" d="M0 193v96h640v-96zM273 0v480h96V0z"/>
</svg>

After

Width:  |  Height:  |  Size: 504 B

6
l10n.yaml Normal file
View 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

10
l10n/app_en.arb Normal file
View File

@@ -0,0 +1,10 @@
{
"@@locale": "en",
"search": "Search",
"liked": "liked!",
"disliked": "disliked (┬┬﹏┬┬)",
"youtube": "tap here to see video",
"arbEnding": "Чтобы не забыть отсутствие запятой"
}

10
l10n/app_ru.arb Normal file
View File

@@ -0,0 +1,10 @@
{
"@@locale": "ru",
"search": "Поиск",
"liked": "понравился!",
"disliked": "больше не нравится (┬┬﹏┬┬)",
"youtube": "нажми сюда чтобы посмотреть",
"arbEnding": "Чтобы не забыть отсутствие запятой"
}

View File

@@ -0,0 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:project/components/locale/l10n/app_locale.dart';
extension LocalContextX on BuildContext {
AppLocale get locale => AppLocale.of(this)!;
}

View File

@@ -0,0 +1,159 @@
import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:intl/intl.dart' as intl;
import 'app_locale_en.dart';
import 'app_locale_ru.dart';
// ignore_for_file: type=lint
/// Callers can lookup localized strings with an instance of AppLocale
/// returned by `AppLocale.of(context)`.
///
/// Applications need to include `AppLocale.delegate()` in their app's
/// `localizationDelegates` list, and the locales they support in the app's
/// `supportedLocales` list. For example:
///
/// ```dart
/// import 'l10n/app_locale.dart';
///
/// return MaterialApp(
/// localizationsDelegates: AppLocale.localizationsDelegates,
/// supportedLocales: AppLocale.supportedLocales,
/// home: MyApplicationHome(),
/// );
/// ```
///
/// ## Update pubspec.yaml
///
/// Please make sure to update your pubspec.yaml to include the following
/// packages:
///
/// ```yaml
/// dependencies:
/// # Internationalization support.
/// flutter_localizations:
/// sdk: flutter
/// intl: any # Use the pinned version from flutter_localizations
///
/// # Rest of dependencies
/// ```
///
/// ## iOS Applications
///
/// iOS applications define key application metadata, including supported
/// locales, in an Info.plist file that is built into the application bundle.
/// To configure the locales supported by your app, youll need to edit this
/// file.
///
/// First, open your projects ios/Runner.xcworkspace Xcode workspace file.
/// Then, in the Project Navigator, open the Info.plist file under the Runner
/// projects Runner folder.
///
/// Next, select the Information Property List item, select Add Item from the
/// Editor menu, then select Localizations from the pop-up menu.
///
/// Select and expand the newly-created Localizations item then, for each
/// locale your application supports, add a new item and select the locale
/// you wish to add from the pop-up menu in the Value field. This list should
/// be consistent with the languages listed in the AppLocale.supportedLocales
/// property.
abstract class AppLocale {
AppLocale(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
final String localeName;
static AppLocale? of(BuildContext context) {
return Localizations.of<AppLocale>(context, AppLocale);
}
static const LocalizationsDelegate<AppLocale> delegate = _AppLocaleDelegate();
/// A list of this localizations delegate along with the default localizations
/// delegates.
///
/// Returns a list of localizations delegates containing this delegate along with
/// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
/// and GlobalWidgetsLocalizations.delegate.
///
/// Additional delegates can be added by appending to this list in
/// MaterialApp. This list does not have to be used at all if a custom list
/// of delegates is preferred or required.
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
delegate,
GlobalMaterialLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
];
/// A list of this localizations delegate's supported locales.
static const List<Locale> supportedLocales = <Locale>[
Locale('en'),
Locale('ru')
];
/// No description provided for @search.
///
/// In ru, this message translates to:
/// **'Поиск'**
String get search;
/// No description provided for @liked.
///
/// In ru, this message translates to:
/// **'понравился!'**
String get liked;
/// No description provided for @disliked.
///
/// In ru, this message translates to:
/// **'больше не нравится (┬┬﹏┬┬)'**
String get disliked;
/// No description provided for @youtube.
///
/// In ru, this message translates to:
/// **'нажми сюда чтобы посмотреть'**
String get youtube;
/// No description provided for @arbEnding.
///
/// In ru, this message translates to:
/// **'Чтобы не забыть отсутствие запятой'**
String get arbEnding;
}
class _AppLocaleDelegate extends LocalizationsDelegate<AppLocale> {
const _AppLocaleDelegate();
@override
Future<AppLocale> load(Locale locale) {
return SynchronousFuture<AppLocale>(lookupAppLocale(locale));
}
@override
bool isSupported(Locale locale) => <String>['en', 'ru'].contains(locale.languageCode);
@override
bool shouldReload(_AppLocaleDelegate old) => false;
}
AppLocale lookupAppLocale(Locale locale) {
// Lookup logic when only language code is specified.
switch (locale.languageCode) {
case 'en': return AppLocaleEn();
case 'ru': return AppLocaleRu();
}
throw FlutterError(
'AppLocale.delegate failed to load unsupported locale "$locale". This is likely '
'an issue with the localizations generation tool. Please file an issue '
'on GitHub with a reproducible sample app and the gen-l10n configuration '
'that was used.'
);
}

View File

@@ -0,0 +1,23 @@
import 'app_locale.dart';
// ignore_for_file: type=lint
/// The translations for English (`en`).
class AppLocaleEn extends AppLocale {
AppLocaleEn([String locale = 'en']) : super(locale);
@override
String get search => 'Search';
@override
String get liked => 'liked!';
@override
String get disliked => 'disliked (┬┬﹏┬┬)';
@override
String get youtube => 'tap here to see video';
@override
String get arbEnding => 'Чтобы не забыть отсутствие запятой';
}

View File

@@ -0,0 +1,23 @@
import 'app_locale.dart';
// ignore_for_file: type=lint
/// The translations for Russian (`ru`).
class AppLocaleRu extends AppLocale {
AppLocaleRu([String locale = 'ru']) : super(locale);
@override
String get search => 'Поиск';
@override
String get liked => 'понравился!';
@override
String get disliked => 'больше не нравится (┬┬﹏┬┬)';
@override
String get youtube => 'нажми сюда чтобы посмотреть';
@override
String get arbEnding => 'Чтобы не забыть отсутствие запятой';
}

View File

@@ -0,0 +1,12 @@
/// Generate by [asset_generator](https://github.com/fluttercandies/flutter_asset_generator) library.
/// PLEASE DO NOT EDIT MANUALLY.
// ignore_for_file: constant_identifier_names
class R {
const R._();
/// ![preview](file://C:\ulstu\pmu\PMU-PIbd-31-Barsukov\assets\svg\ru.svg)
static const String ASSETS_SVG_RU_SVG = 'assets/svg/ru.svg';
/// ![preview](file://C:\ulstu\pmu\PMU-PIbd-31-Barsukov\assets\svg\uk.svg)
static const String ASSETS_SVG_UK_SVG = 'assets/svg/uk.svg';
}

View File

@@ -9,10 +9,11 @@ class Debounce {
static final Debounce _instance = Debounce._();
static Timer? _timer;
static void run(VoidCallback action, {
static void run(
VoidCallback action, {
Duration delay = const Duration(milliseconds: 500),
}) {
_timer?.cancel();
_timer = Timer(delay, action);
}
}
}

View File

@@ -3,7 +3,7 @@ import 'package:json_annotation/json_annotation.dart';
part 'emotes_dto.g.dart';
@JsonSerializable(createToJson: false)
class EmotesDto{
class EmotesDto {
final List<EmoteDataDto>? data;
const EmotesDto({this.data});
@@ -12,35 +12,25 @@ class EmotesDto{
}
@JsonSerializable(createToJson: false)
class EmoteDataDto{
class EmoteDataDto {
final String? id;
final String? name;
final String? description;
final String? showcaseVideo;
final EmoteRarityDto? rarity;
final EmoteImagesDto? images;
const EmoteDataDto({this.id, this.name, this.description, this.showcaseVideo, this.rarity, this.images});
const EmoteDataDto(
{this.id, this.name, this.description, this.showcaseVideo, this.images});
factory EmoteDataDto.fromJson(Map<String, dynamic> json) => _$EmoteDataDtoFromJson(json);
}
@JsonSerializable(createToJson: false)
class EmoteRarityDto{
final String? value;
final String? displayValue;
const EmoteRarityDto({this.value, this.displayValue});
factory EmoteRarityDto.fromJson(Map<String, dynamic> json) => _$EmoteRarityDtoFromJson(json);
}
@JsonSerializable(createToJson: false)
class EmoteImagesDto{
class EmoteImagesDto {
final String? icon;
final String? smallIcon;
const EmoteImagesDto({this.icon, this.smallIcon});
factory EmoteImagesDto.fromJson(Map<String, dynamic> json) => _$EmoteImagesDtoFromJson(json);
}
}

View File

@@ -0,0 +1,29 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'emotes_dto.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
EmotesDto _$EmotesDtoFromJson(Map<String, dynamic> json) => EmotesDto(
data: (json['data'] as List<dynamic>?)
?.map((e) => EmoteDataDto.fromJson(e as Map<String, dynamic>))
.toList(),
);
EmoteDataDto _$EmoteDataDtoFromJson(Map<String, dynamic> json) => EmoteDataDto(
id: json['id'] as String?,
name: json['name'] as String?,
description: json['description'] as String?,
showcaseVideo: json['showcaseVideo'] as String?,
images: json['images'] == null
? null
: EmoteImagesDto.fromJson(json['images'] as Map<String, dynamic>),
);
EmoteImagesDto _$EmoteImagesDtoFromJson(Map<String, dynamic> json) =>
EmoteImagesDto(
icon: json['icon'] as String?,
smallIcon: json['smallIcon'] as String?,
);

View File

@@ -1,12 +1,19 @@
import 'package:project/data/dtos/emotes_dto.dart';
import 'package:project/domain/models/card.dart';
import 'package:project/domain/models/home.dart';
extension EmoteDataDtoToModel on EmoteDataDto{
extension EmoteDataDtoToModel on EmoteDataDto {
CardData toDomain() => CardData(
name ?? "UNKNOWN",
description: description ?? "NODESCRIPTION",
rarity: rarity?.displayValue ?? "NORARITY",
video: 'https://www.youtube.com/watch?v=${showcaseVideo}',
image: images?.icon,
name ?? "UNKNOWN",
description: description ?? "NODESCRIPTION",
video: 'https://www.youtube.com/watch?v=${showcaseVideo}',
image: images?.icon,
id: id,
);
}
extension EmotesDtoToModel on EmotesDto{
HomeData toDomain() => HomeData(
data: data?.map((e) => e.toDomain()).toList(),
);
}

View File

@@ -3,7 +3,7 @@ import 'package:pretty_dio_logger/pretty_dio_logger.dart';
import 'package:project/data/dtos/emotes_dto.dart';
import 'package:project/data/mappers/emotes_mapper.dart';
import 'package:project/data/repositories/api_interface.dart';
import 'package:project/domain/models/card.dart';
import 'package:project/domain/models/home.dart';
class EmotesRepository extends ApiInterface {
static final Dio _dio = Dio()
@@ -15,7 +15,7 @@ class EmotesRepository extends ApiInterface {
static const String _baseUrl = 'https://fortnite-api.com';
@override
Future<List<CardData>?> loadData({String? q, onErrorCallback? onError}) async {
Future<HomeData?> loadData({String? q, onErrorCallback? onError}) async {
try {
String url =
'$_baseUrl/v2/cosmetics/br/search/all?type=emote&introductionChapter=5&introductionSeason=3';
@@ -23,12 +23,10 @@ class EmotesRepository extends ApiInterface {
if (q != null && q != '') {
url += '&matchMethod=starts&name=$q';
}
final Response<dynamic> response =
await _dio.get<Map<dynamic, dynamic>>(url);
final Response<dynamic> response = await _dio.get<Map<dynamic, dynamic>>(url);
final EmotesDto dto =
EmotesDto.fromJson(response.data as Map<String, dynamic>);
final List<CardData>? data = dto.data?.map((e) => e.toDomain()).toList();
final EmotesDto dto = EmotesDto.fromJson(response.data as Map<String, dynamic>);
final HomeData data = dto.toDomain();
return data;
} on DioException catch (e) {
onError?.call(e.error?.toString());

View File

@@ -1,6 +1,7 @@
import 'package:project/domain/models/card.dart';
import 'package:project/domain/models/home.dart';
typedef onErrorCallback = void Function(String? error);
abstract class ApiInterface{
Future<List<CardData>?> loadData();
}
abstract class ApiInterface {
Future<HomeData?> loadData();
}

View File

@@ -1,15 +1,10 @@
class CardData {
final String name;
final String rarity;
final String description;
final String video;
final String? image;
final String? id;
CardData(
this.name, {
required this.description,
required this.rarity,
required this.video,
this.image
});
CardData(this.name,
{required this.description, required this.video, this.image, this.id});
}

View File

@@ -0,0 +1,7 @@
import 'card.dart';
class HomeData{
final List<CardData>? data;
HomeData({this.data});
}

View File

@@ -1,8 +1,15 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:project/data/repositories/EmotesRepository.dart';
import 'package:project/presentation/home_page/bloc/bloc.dart';
import 'package:project/presentation/home_page/home_page.dart';
import 'package:project/presentation/home_page/like_bloc/like_bloc.dart';
import 'package:project/presentation/home_page/locale_bloc/locale_bloc.dart';
import 'package:project/presentation/home_page/locale_bloc/locale_state.dart';
import 'components/locale/l10n/app_locale.dart';
void main() {
runApp(const MyApp());
@@ -13,22 +20,37 @@ 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,
return BlocProvider<LocaleBloc>(
lazy: false,
create: (context) => LocaleBloc(Locale(Platform.localeName)),
child: BlocBuilder<LocaleBloc, LocaleState>(
builder: (context, state) {
return MaterialApp(
title: 'Flutter Demo',
locale: state.currentLocale,
localizationsDelegates: AppLocale.localizationsDelegates,
supportedLocales: AppLocale.supportedLocales,
debugShowCheckedModeBanner: false,
theme: ThemeData(
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
useMaterial3: true,
),
home: RepositoryProvider<EmotesRepository>(
lazy: true,
create: (_) => EmotesRepository(),
child: BlocProvider<LikeBloc>(
lazy: false,
create: (context) => LikeBloc(),
child: BlocProvider<HomeBloc>(
lazy: false,
create: (context) => HomeBloc(context.read<EmotesRepository>()),
child: const MyHomePage(title: 'Барсуков Павел ПИбд-31'),
),
),
),
);
},
),
home: RepositoryProvider<EmotesRepository>(
lazy: true,
create: (_) => EmotesRepository(),
child: BlocProvider<HomeBloc>(
lazy: false,
create: (context) => HomeBloc(context.read<EmotesRepository>()),
child: const MyHomePage(title: 'Барсуков Павел ПИбд-31'),
),
)
);
}
}

View File

@@ -0,0 +1,34 @@
import 'package:flutter/cupertino.dart';
import 'package:project/components/resources.g.dart';
import 'package:flutter_svg/flutter_svg.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);
}
}

View File

@@ -1,5 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:project/components/extensions/context_x.dart';
import 'package:project/domain/models/card.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:flutter/material.dart';
@@ -14,8 +15,7 @@ class DetailsPage extends StatelessWidget {
return Scaffold(
backgroundColor: Color(0xFFb6e0b8),
appBar: AppBar(
shape:
const Border(bottom: BorderSide(color: Colors.black87, width: 3)),
shape: const Border(bottom: BorderSide(color: Colors.black87, width: 3)),
backgroundColor: Colors.lightGreen,
title: Text(data.name),
),
@@ -45,7 +45,8 @@ class DetailsPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
ConstrainedBox(
constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.9),
constraints:
BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.9),
child: Text(
data.name,
style: new TextStyle(
@@ -55,11 +56,11 @@ class DetailsPage extends StatelessWidget {
),
),
ConstrainedBox(
constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.8),
constraints:
BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.8),
child: Text(
data.description,
style: new TextStyle(
fontSize: 18, fontStyle: FontStyle.italic),
style: new TextStyle(fontSize: 18, fontStyle: FontStyle.italic),
textAlign: TextAlign.center,
),
),
@@ -79,7 +80,7 @@ class DetailsPage extends StatelessWidget {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
"Tap here to see video",
context.locale.youtube,
style: new TextStyle(fontSize: 18),
),
),

View File

@@ -3,24 +3,20 @@ import 'package:project/data/repositories/EmotesRepository.dart';
import 'package:project/presentation/home_page/bloc/events.dart';
import 'package:project/presentation/home_page/bloc/state.dart';
class HomeBloc extends Bloc<HomeEvent, HomeState>{
class HomeBloc extends Bloc<HomeEvent, HomeState> {
final EmotesRepository repo;
HomeBloc(this.repo): super(const HomeState()){
HomeBloc(this.repo) : super(const HomeState()) {
on<HomeLoadDataEvent>(_onLoadData);
}
Future<void> _onLoadData(HomeLoadDataEvent event, Emitter<HomeState> emit) async{
Future<void> _onLoadData(HomeLoadDataEvent event, Emitter<HomeState> emit) async {
String? error;
emit(state.copyWith(isLoading: true));
final data = await repo.loadData(q: event.search, onError: (e) => error = e);
emit(state.copyWith(
isLoading: false,
data: data,
error: error
));
emit(state.copyWith(isLoading: false, data: data, error: error));
}
}
}

View File

@@ -1,9 +1,9 @@
abstract class HomeEvent{
abstract class HomeEvent {
const HomeEvent();
}
class HomeLoadDataEvent extends HomeEvent{
class HomeLoadDataEvent extends HomeEvent {
final String? search;
const HomeLoadDataEvent({this.search});
}
}

View File

@@ -1,19 +1,14 @@
import 'package:equatable/equatable.dart';
import 'package:project/domain/models/card.dart';
import '../../../domain/models/home.dart';
class HomeState extends Equatable {
final List<CardData>? data;
final HomeData? data;
final bool isLoading;
final String? error;
const HomeState({this.data, this.isLoading = false, this.error});
HomeState copyWith({
List<CardData>? data,
bool? isLoading,
String? error
}) =>
HomeState(
HomeState copyWith({HomeData? data, bool? isLoading, String? error}) => HomeState(
data: data ?? this.data,
isLoading: isLoading ?? this.isLoading,
error: error ?? this.error,

View File

@@ -1,35 +1,37 @@
part of 'home_page.dart';
typedef OnLikeCallBack = void Function(String title, bool isLiked);
typedef OnLikeCallBack = void Function(String? id, String title, bool isLiked)?;
class _Card extends StatefulWidget {
class _Card extends StatelessWidget {
final String text;
final String? image;
final OnLikeCallBack? onLike;
final OnLikeCallBack onLike;
final VoidCallback? onTap;
final String? id;
final bool isLiked;
const _Card(this.text, this.image, {this.onLike, this.onTap});
const _Card(this.text, this.image,
{required this.onLike, this.onTap, this.id, this.isLiked = false});
factory _Card.fromData(CardData data,
{OnLikeCallBack? onLike, VoidCallback? onTap}) =>
factory _Card.fromData(
CardData data, {
OnLikeCallBack onLike,
VoidCallback? onTap,
bool isLiked = false,
}) =>
_Card(
data.name,
data.image,
onLike: onLike,
onTap: onTap,
isLiked: isLiked,
id: data.id,
);
@override
State<_Card> createState() => _CardState();
}
class _CardState extends State<_Card> {
bool isLiked = false;
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: widget.onTap,
onTap: onTap,
child: Container(
margin: const EdgeInsets.all(16),
padding: const EdgeInsets.all(16),
@@ -46,7 +48,7 @@ class _CardState extends State<_Card> {
height: 140,
width: 100,
child: Image.network(
widget.image ?? '',
image ?? '',
fit: BoxFit.cover,
errorBuilder: (_, __, ___) => const Placeholder(),
),
@@ -57,27 +59,21 @@ class _CardState extends State<_Card> {
padding: const EdgeInsets.only(left: 16),
child: FittedBox(
child: Text(
widget.text,
text,
style: Theme.of(context).textTheme.headlineLarge,
),
),
),
),
GestureDetector(
onTap: () {
setState(() {
isLiked = !isLiked;
});
widget.onLike?.call(widget.text, isLiked);
},
onTap: () => onLike?.call(id, text, isLiked),
child: Align(
alignment: Alignment.bottomRight,
child: AnimatedSwitcher(
duration: const Duration(milliseconds: 300),
child: isLiked
? const Icon(Icons.favorite, key: ValueKey<int>(0))
: const Icon(Icons.favorite_border,
key: ValueKey<int>(1)),
: const Icon(Icons.favorite_border, key: ValueKey<int>(1)),
),
))
],

View File

@@ -1,14 +1,22 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:project/components/extensions/context_x.dart';
import 'package:project/components/utils/debounce.dart';
import 'package:project/main.dart';
import 'package:project/presentation/common/svg_objects.dart';
import 'package:project/presentation/home_page/bloc/bloc.dart';
import 'package:project/presentation/home_page/bloc/state.dart';
import 'package:project/presentation/home_page/like_bloc/like_event.dart';
import 'package:project/presentation/home_page/locale_bloc/locale_bloc.dart';
import 'package:project/presentation/home_page/locale_bloc/locale_events.dart';
import 'package:project/presentation/home_page/locale_bloc/locale_state.dart';
import '../../data/repositories/EmotesRepository.dart';
import '../../domain/models/card.dart';
import '../details_page/details_page.dart';
import 'bloc/events.dart';
import 'like_bloc/like_bloc.dart';
import 'like_bloc/like_state.dart';
part 'card.dart';
@@ -27,8 +35,7 @@ class _MyHomePageState extends State<MyHomePage> {
return Scaffold(
backgroundColor: Color(0xFFb6e0b8),
appBar: AppBar(
shape:
const Border(bottom: BorderSide(color: Colors.black87, width: 3)),
shape: const Border(bottom: BorderSide(color: Colors.black87, width: 3)),
backgroundColor: Colors.lightGreen,
title: Text(widget.title),
),
@@ -46,26 +53,13 @@ class Body extends StatefulWidget {
class _BodyState extends State<Body> {
final searchController = TextEditingController();
final repo = EmotesRepository();
late Future<List<CardData>?> data;
void _showSnackBar(BuildContext context, String title, bool isLiked) {
WidgetsBinding.instance.addPostFrameCallback((_) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text(
'Emote $title ${isLiked ? 'liked' : 'remove from liked'}',
style: Theme.of(context).textTheme.bodyLarge,
),
backgroundColor: Colors.lightGreenAccent,
duration: const Duration(seconds: 1),
));
});
}
@override
void initState() {
SvgObjects.init();
WidgetsBinding.instance.addPostFrameCallback((_) {
context.read<HomeBloc>().add(const HomeLoadDataEvent());
context.read<LikeBloc>().add(const LoadLikesEvent());
});
super.initState();
}
@@ -76,62 +70,109 @@ class _BodyState extends State<Body> {
super.dispose();
}
Future<void> _onRefresh(){
Future<void> _onRefresh() {
context.read<HomeBloc>().add(HomeLoadDataEvent(search: searchController.text));
return Future.value(null);
}
void _onLike(String? id, String title, bool isLiked) {
if (id != null) {
context.read<LikeBloc>().add(ChangeLikeEvent(id));
_showSnackBar(context, title, !isLiked);
}
}
void _showSnackBar(BuildContext context, String title, bool isLiked) {
WidgetsBinding.instance.addPostFrameCallback((_) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text(
'$title ${isLiked ? context.locale.liked : context.locale.disliked}',
style: Theme.of(context).textTheme.bodyLarge,
),
backgroundColor: Colors.lightGreenAccent,
duration: const Duration(seconds: 1),
));
});
}
@override
Widget build(BuildContext context) {
return Padding(
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
child: Column(
children: [
Padding(
padding: const EdgeInsets.all(12),
child: CupertinoSearchTextField(
placeholderStyle: const TextStyle(color: Colors.black54),
controller: searchController,
onChanged: (search) {
Debounce.run(() => context.read<HomeBloc>().add(HomeLoadDataEvent(search: search)));
},
),
Row(
children: [
Expanded(
flex: 4,
child: Padding(
padding: const EdgeInsets.all(12),
child: CupertinoSearchTextField(
placeholderStyle: const TextStyle(color: Colors.black54),
placeholder: context.locale.search,
controller: searchController,
onChanged: (search) {
Debounce.run(
() => context.read<HomeBloc>().add(HomeLoadDataEvent(search: search)));
},
),
),
),
GestureDetector(
onTap: () => context.read<LocaleBloc>().add(const ChangeLocaleEvent()),
child: SizedBox.square(
dimension: 50,
child: Padding(
padding: const EdgeInsets.only(right: 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 CircularProgressIndicator()
: Expanded(
child: RefreshIndicator(
onRefresh: _onRefresh,
child: ListView.builder(
padding: EdgeInsets.zero,
itemCount: state.data?.length ?? 0,
itemBuilder: (context, index) {
final data = state.data?[index];
return data != null
? _Card.fromData(
data,
onLike: (String title, bool isLiked) =>
_showSnackBar(context, title, isLiked),
onTap: () => _navToDetailes(context, data),
)
: const SizedBox.shrink();
},
),
),
)),
? Text(
state.error ?? '',
style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.red),
)
: state.isLoading
? const CircularProgressIndicator()
: state.isLoading
? const CircularProgressIndicator()
: BlocBuilder<LikeBloc, LikeState>(builder: (context, likeState) {
return Expanded(
child: RefreshIndicator(
onRefresh: _onRefresh,
child: ListView.builder(
padding: EdgeInsets.zero,
itemCount: state.data?.data?.length ?? 0,
itemBuilder: (context, index) {
final data = state.data?.data?[index];
return data != null
? _Card.fromData(
data,
onLike: _onLike,
isLiked: likeState.likedIds?.contains(data.id) == true,
onTap: () => _navToDetailes(context, data),
)
: const SizedBox.shrink();
},
),
));
}))
],
),
);
}
void _navToDetailes(BuildContext context, CardData data) {
Navigator.push(
context, CupertinoPageRoute(builder: (context) => DetailsPage(data)));
Navigator.push(context, CupertinoPageRoute(builder: (context) => DetailsPage(data)));
}
}

View File

@@ -0,0 +1,36 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'like_event.dart';
import 'like_state.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));
}
}

View 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);
}

View File

@@ -0,0 +1,12 @@
import 'package:equatable/equatable.dart';
class LikeState extends Equatable {
final List<String>? likedIds;
const LikeState({required this.likedIds});
@override
List<Object?> get props => [likedIds];
LikeState copyWith({List<String>? likedIds}) => LikeState(likedIds: likedIds ?? this.likedIds);
}

View File

@@ -0,0 +1,18 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../components/locale/l10n/app_locale.dart';
import 'locale_events.dart';
import '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));
}
}

View File

@@ -0,0 +1,7 @@
abstract class LocaleEvent {
const LocaleEvent();
}
class ChangeLocaleEvent extends LocaleEvent {
const ChangeLocaleEvent();
}

View File

@@ -0,0 +1,14 @@
import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
class LocaleState extends Equatable {
final Locale currentLocale;
const LocaleState({required this.currentLocale});
@override
List<Object?> get props => [currentLocale];
LocaleState copyWith({Locale? currentLocale}) =>
LocaleState(currentLocale: currentLocale ?? this.currentLocale);
}

19
makefile Normal file
View File

@@ -0,0 +1,19 @@
gen:
flutter pub run build_runner build --delete-conflicting-outputs
icon:
flutter pub run flutter_launcher_icons:main
init_res:
dart pub global activate flutter_asset_generator
format:
dart format . --line-length 100
res:
fgen --output lib/components/resources.g.dart --no-watch --no-preview;
nmake format
loc:
flutter gen-l10n
nmake format

View File

@@ -22,6 +22,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "6.7.0"
archive:
dependency: transitive
description:
name: archive
sha256: "08064924cbf0ab88280a0c3f60db9dd24fec693927e725ecb176f16c629d1cb8"
url: "https://pub.dev"
source: hosted
version: "4.0.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: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
url: "https://pub.dev"
source: hosted
version: "0.4.2"
clock:
dependency: transitive
description:
@@ -222,6 +238,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,14 +275,27 @@ packages:
url: "https://pub.dev"
source: hosted
version: "8.1.6"
flutter_lints:
dependency: "direct dev"
flutter_launcher_icons:
dependency: "direct main"
description:
name: flutter_lints
sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
name: flutter_launcher_icons
sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
url: "https://pub.dev"
source: hosted
version: "4.0.0"
version: "0.13.1"
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
@@ -293,6 +330,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:
@@ -309,6 +354,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.2"
image:
dependency: transitive
description:
name: image
sha256: "20842a5ad1555be624c314b0c0cc0566e8ece412f61e859a42efeb6d4101a26c"
url: "https://pub.dev"
source: hosted
version: "4.5.0"
intl:
dependency: "direct main"
description:
name: intl
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
url: "https://pub.dev"
source: hosted
version: "0.19.0"
io:
dependency: transitive
description:
@@ -365,14 +426,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.0.1"
lints:
dependency: transitive
description:
name: lints
sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
url: "https://pub.dev"
source: hosted
version: "4.0.0"
logging:
dependency: transitive
description:
@@ -445,6 +498,54 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.9.0"
path_parsing:
dependency: transitive
description:
name: path_parsing
sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
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: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
url: "https://pub.dev"
source: hosted
version: "3.1.6"
plugin_platform_interface:
dependency: transitive
description:
@@ -461,6 +562,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.5.1"
posix:
dependency: transitive
description:
name: posix
sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
url: "https://pub.dev"
source: hosted
version: "6.0.1"
pretty_dio_logger:
dependency: "direct main"
description:
@@ -493,6 +602,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: "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d"
url: "https://pub.dev"
source: hosted
version: "2.4.0"
shared_preferences_foundation:
dependency: transitive
description:
name: shared_preferences_foundation
sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
url: "https://pub.dev"
source: hosted
version: "2.5.4"
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:
@@ -666,6 +831,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.1.3"
vector_graphics:
dependency: transitive
description:
name: vector_graphics
sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7"
url: "https://pub.dev"
source: hosted
version: "1.1.15"
vector_graphics_codec:
dependency: transitive
description:
name: vector_graphics_codec
sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb"
url: "https://pub.dev"
source: hosted
version: "1.1.12"
vector_graphics_compiler:
dependency: transitive
description:
name: vector_graphics_compiler
sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad"
url: "https://pub.dev"
source: hosted
version: "1.1.16"
vector_math:
dependency: transitive
description:
@@ -714,6 +903,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.0.1"
xdg_directories:
dependency: transitive
description:
name: xdg_directories
sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
xml:
dependency: transitive
description:
name: xml
sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
url: "https://pub.dev"
source: hosted
version: "6.5.0"
yaml:
dependency: transitive
description:

View File

@@ -17,6 +17,12 @@ dependencies:
url_launcher: ^6.0.20
equatable: ^2.0.5
flutter_bloc: ^8.1.5
flutter_launcher_icons: 0.13.1
flutter_svg: 2.0.7
intl: ^0.19.0
shared_preferences: 2.2.3
flutter_localizations:
sdk: flutter
dev_dependencies:
flutter_test:
@@ -25,7 +31,15 @@ dev_dependencies:
build_runner: ^2.4.9
json_serializable: ^6.7.1
flutter_icons:
android: "ic_launcher"
image_path: "assets/iconcool.png"
min_sdk_android: 21
flutter_lints: ^4.0.0
flutter:
generate: true
uses-material-design: true
assets:
- assets/svg/