до слез
This commit is contained in:
parent
12ac42cca0
commit
2e4cfb250a
3
android/app/src/main/res/mipmap-anydpi-v26/ic_launch.xml
Normal file
3
android/app/src/main/res/mipmap-anydpi-v26/ic_launch.xml
Normal file
@ -0,0 +1,3 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
</adaptive-icon>
|
||||
@ -0,0 +1,3 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
</adaptive-icon>
|
||||
BIN
android/app/src/main/res/mipmap-hdpi/ic_launch.png
Normal file
BIN
android/app/src/main/res/mipmap-hdpi/ic_launch.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.6 KiB |
BIN
android/app/src/main/res/mipmap-mdpi/ic_launch.png
Normal file
BIN
android/app/src/main/res/mipmap-mdpi/ic_launch.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.9 KiB |
BIN
android/app/src/main/res/mipmap-xhdpi/ic_launch.png
Normal file
BIN
android/app/src/main/res/mipmap-xhdpi/ic_launch.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
BIN
android/app/src/main/res/mipmap-xxhdpi/ic_launch.png
Normal file
BIN
android/app/src/main/res/mipmap-xxhdpi/ic_launch.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
BIN
android/app/src/main/res/mipmap-xxxhdpi/ic_launch.png
Normal file
BIN
android/app/src/main/res/mipmap-xxxhdpi/ic_launch.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 40 KiB |
BIN
assets/icon.jpeg
Normal file
BIN
assets/icon.jpeg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 64 KiB |
BIN
assets/icon.jpg
Normal file
BIN
assets/icon.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 68 KiB |
45
assets/svg/ru.svg
Normal file
45
assets/svg/ru.svg
Normal file
@ -0,0 +1,45 @@
|
||||
<?xml version="1.0" standalone="no"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
|
||||
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
|
||||
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
|
||||
width="1024.000000pt" height="1024.000000pt" viewBox="0 0 512.000000 512.000000"
|
||||
preserveAspectRatio="xMidYMid meet">
|
||||
|
||||
<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
|
||||
fill="#ffa420" stroke="none">
|
||||
<path d="M2252 5104 c-42 -21 -69 -56 -82 -105 -11 -39 -11 -39 -60 -39 -63 0
|
||||
-78 -6 -96 -42 -13 -25 -13 -35 -3 -59 15 -39 37 -49 98 -49 l51 0 0 -85 0
|
||||
-85 -45 0 c-59 0 -92 -16 -104 -52 -8 -23 -7 -37 4 -58 17 -34 33 -40 95 -40
|
||||
l47 0 7 -52 c9 -68 23 -92 95 -163 l61 -59 0 -224 c0 -246 7 -286 54 -298 44
|
||||
-11 76 4 92 42 l15 35 82 -3 82 -3 3 -202 2 -203 -90 0 -90 0 0 58 c0 64 -13
|
||||
85 -61 97 -20 5 -33 0 -55 -18 l-29 -25 -3 -573 -3 -573 -47 -56 c-462 -534
|
||||
-915 -1218 -1243 -1872 -83 -165 -99 -205 -99 -244 0 -59 29 -108 81 -134 37
|
||||
-20 66 -20 1549 -20 1483 0 1512 0 1549 20 52 26 81 75 81 134 0 38 -15 77
|
||||
-90 227 -214 427 -471 853 -760 1259 -128 180 -294 398 -318 418 -28 22 -78
|
||||
15 -101 -14 -38 -48 -43 -37 160 -306 117 -154 340 -471 335 -475 -6 -7 -271
|
||||
88 -286 102 -10 9 -30 50 -45 91 -52 143 -152 257 -278 318 -178 88 -394 73
|
||||
-560 -39 -40 -27 -79 -45 -95 -45 -30 0 -122 28 -122 37 0 9 289 373 296 373
|
||||
2 0 20 -18 41 -41 25 -26 51 -43 78 -49 53 -13 191 -12 235 0 47 13 99 68 111
|
||||
116 5 22 9 494 9 1063 l0 1024 69 72 c50 51 72 83 81 114 7 28 10 134 8 324
|
||||
-3 312 -5 322 -70 369 -32 23 -38 23 -318 26 -248 2 -289 0 -318 -14z m556
|
||||
-402 l2 -264 -69 -71 c-37 -40 -73 -82 -80 -94 -7 -14 -11 -84 -11 -187 l0
|
||||
-166 -89 0 -90 0 -3 179 -3 179 -77 80 -78 80 0 259 c0 143 3 263 7 267 4 3
|
||||
115 5 247 4 l241 -3 3 -263z m-160 -1659 l2 -163 -90 0 -90 0 0 158 c0 87 3
|
||||
162 7 166 4 4 43 5 88 4 l80 -3 3 -162z m-3 -443 l0 -125 -85 0 -85 0 -3 114
|
||||
c-1 63 0 121 2 128 4 10 26 13 88 11 l83 -3 0 -125z m3 -362 l-3 -83 -85 0
|
||||
-85 0 -3 83 -3 82 91 0 91 0 -3 -82z m82 -594 c109 -51 176 -131 222 -264 26
|
||||
-77 61 -125 110 -153 24 -14 144 -58 267 -98 l223 -74 98 -165 c158 -267 364
|
||||
-651 384 -717 l7 -23 -1481 0 -1481 0 6 23 c25 84 319 615 507 917 84 136 311
|
||||
473 334 499 3 3 44 -8 92 -23 114 -37 186 -34 256 10 26 16 64 39 84 52 65 39
|
||||
120 52 217 49 76 -2 100 -7 155 -33z"/>
|
||||
<path d="M2514 4777 c-25 -22 -28 -31 -32 -108 -5 -105 11 -159 51 -173 75
|
||||
-27 111 33 105 173 -4 77 -7 86 -32 108 -15 12 -36 23 -46 23 -10 0 -31 -11
|
||||
-46 -23z"/>
|
||||
<path d="M2470 1494 c-45 -20 -97 -69 -121 -117 -23 -44 -27 -135 -9 -182 50
|
||||
-131 214 -191 333 -122 81 48 119 114 118 209 0 91 -58 177 -143 212 -47 20
|
||||
-132 20 -178 0z m144 -155 c19 -15 26 -30 26 -55 0 -47 -13 -69 -50 -84 -86
|
||||
-35 -156 83 -82 140 32 26 72 25 106 -1z"/>
|
||||
<path d="M2117 778 c-42 -33 -37 -106 9 -127 35 -16 833 -16 868 0 34 16 47
|
||||
57 31 96 -7 16 -20 33 -30 37 -9 3 -207 6 -439 6 -322 0 -426 -3 -439 -12z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.8 KiB |
45
assets/svg/uk.svg
Normal file
45
assets/svg/uk.svg
Normal file
@ -0,0 +1,45 @@
|
||||
<?xml version="1.0" standalone="no"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
|
||||
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
|
||||
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
|
||||
width="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000"
|
||||
preserveAspectRatio="xMidYMid meet">
|
||||
|
||||
<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
|
||||
fill="#ffa420" stroke="none">
|
||||
<path d="M2365 5024 c-16 -2 -70 -9 -120 -15 -322 -38 -657 -180 -763 -321
|
||||
-69 -92 -82 -148 -82 -364 0 -207 6 -230 69 -267 l31 -18 0 -116 0 -116 -40
|
||||
-34 c-24 -21 -44 -49 -50 -71 -8 -26 -10 -565 -8 -1774 3 -1736 3 -1737 24
|
||||
-1764 11 -15 33 -37 48 -48 27 -21 32 -21 1086 -21 1054 0 1059 0 1086 21 15
|
||||
11 37 33 48 48 21 27 21 28 24 1764 2 1209 0 1748 -8 1774 -6 22 -26 50 -50
|
||||
71 l-40 34 0 116 0 115 34 21 c62 38 68 67 64 289 l-3 197 -32 67 c-18 40 -52
|
||||
88 -80 115 -120 119 -402 233 -688 278 -95 15 -481 29 -550 19z m426 -124
|
||||
c301 -31 611 -141 730 -260 65 -65 110 -202 46 -142 -43 40 -189 121 -292 162
|
||||
-455 177 -974 178 -1427 1 -105 -41 -252 -122 -295 -163 -64 -60 -19 77 46
|
||||
141 117 116 430 230 712 260 121 12 360 13 480 1z m-90 -230 c228 -23 478 -89
|
||||
631 -166 93 -47 150 -85 216 -147 l52 -50 0 -73 0 -74 -1040 0 -1040 0 0 74 0
|
||||
73 53 50 c139 131 341 221 618 277 214 44 343 52 510 36z m799 -745 l0 -115
|
||||
-940 0 -940 0 0 115 0 115 940 0 940 0 0 -115z m88 -247 c17 -17 17 -3439 0
|
||||
-3456 -8 -8 -49 -12 -120 -12 l-108 0 0 1592 c0 1467 -1 1593 -17 1610 -15 17
|
||||
-53 18 -783 18 -582 0 -769 -3 -778 -12 -9 -9 -12 -380 -12 -1610 l0 -1598
|
||||
-113 0 c-75 0 -117 4 -125 12 -17 17 -17 3439 0 3456 17 17 2039 17 2056 0z
|
||||
m-1338 -698 l0 -330 -185 0 -185 0 0 330 0 330 185 0 185 0 0 -330z m500 0 l0
|
||||
-330 -190 0 -190 0 0 330 0 330 190 0 190 0 0 -330z m490 0 l0 -330 -120 0
|
||||
c-107 0 -122 -2 -140 -20 -24 -24 -26 -57 -3 -82 14 -16 33 -18 140 -18 l123
|
||||
0 0 -335 0 -335 -185 0 -185 0 0 725 0 725 185 0 185 0 0 -330z m-990 -1195
|
||||
l0 -745 -185 0 -185 0 0 349 0 349 126 4 c111 3 127 5 140 22 16 23 18 54 4
|
||||
76 -7 12 -38 16 -137 20 l-128 5 -3 320 c-1 176 0 325 3 332 3 10 49 13 185
|
||||
13 l180 0 0 -745z m500 410 l0 -335 -187 2 -188 3 -3 320 c-1 176 0 325 3 332
|
||||
3 10 50 13 190 13 l185 0 0 -335z m0 -805 l0 -350 -190 0 -190 0 0 350 0 350
|
||||
190 0 190 0 0 -350z m490 0 l0 -350 -185 0 -185 0 0 350 0 350 185 0 185 0 0
|
||||
-350z m0 -825 l0 -355 -680 0 -680 0 0 348 c0 192 3 352 7 355 3 4 309 7 680
|
||||
7 l673 0 0 -355z"/>
|
||||
<path d="M2287 4552 c-20 -22 -23 -105 -6 -163 16 -50 61 -105 112 -132 37
|
||||
-19 57 -22 167 -22 110 0 130 3 167 22 81 44 123 120 123 225 0 90 6 88 -292
|
||||
88 -234 0 -256 -1 -271 -18z m443 -106 c0 -23 -26 -60 -52 -76 -26 -16 -51
|
||||
-20 -116 -20 -89 0 -129 13 -156 52 -33 46 -27 48 154 48 94 0 170 -2 170 -4z"/>
|
||||
<path d="M3450 2370 c-19 -19 -20 -33 -20 -199 0 -175 1 -180 22 -195 30 -21
|
||||
54 -20 78 4 18 18 20 33 20 195 0 162 -2 177 -20 195 -11 11 -29 20 -40 20
|
||||
-11 0 -29 -9 -40 -20z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.8 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
|
||||
8
l10n/app_en.arb
Normal file
8
l10n/app_en.arb
Normal file
@ -0,0 +1,8 @@
|
||||
{
|
||||
"@@locale": "en",
|
||||
|
||||
"search": "Search",
|
||||
"liked": "liked!",
|
||||
"disliked": "unliked"
|
||||
|
||||
}
|
||||
7
l10n/app_ru.arb
Normal file
7
l10n/app_ru.arb
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
"@@locale": "ru",
|
||||
|
||||
"search": "Поиск",
|
||||
"liked": "понравился!",
|
||||
"disliked": "разонравился"
|
||||
}
|
||||
@ -22,5 +22,4 @@ class CardData {
|
||||
required this.summary,
|
||||
this.imageUrl,
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
6
lib/components/extension/context_x.dart
Normal file
6
lib/components/extension/context_x.dart
Normal file
@ -0,0 +1,6 @@
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:pmd_labs/components/locale/l10n/app_locale.dart';
|
||||
|
||||
extension LocalContextX on BuildContext {
|
||||
AppLocale get locale => AppLocale.of(this)!;
|
||||
}
|
||||
147
lib/components/locale/l10n/app_locale.dart
Normal file
147
lib/components/locale/l10n/app_locale.dart
Normal file
@ -0,0 +1,147 @@
|
||||
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, you’ll need to edit this
|
||||
/// file.
|
||||
///
|
||||
/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file.
|
||||
/// Then, in the Project Navigator, open the Info.plist file under the Runner
|
||||
/// project’s 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;
|
||||
}
|
||||
|
||||
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.'
|
||||
);
|
||||
}
|
||||
17
lib/components/locale/l10n/app_locale_en.dart
Normal file
17
lib/components/locale/l10n/app_locale_en.dart
Normal file
@ -0,0 +1,17 @@
|
||||
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 => 'unliked';
|
||||
}
|
||||
17
lib/components/locale/l10n/app_locale_ru.dart
Normal file
17
lib/components/locale/l10n/app_locale_ru.dart
Normal file
@ -0,0 +1,17 @@
|
||||
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 => 'разонравился';
|
||||
}
|
||||
10
lib/components/resources.g.dart
Normal file
10
lib/components/resources.g.dart
Normal file
@ -0,0 +1,10 @@
|
||||
/// 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._();
|
||||
|
||||
static const String ASSETS_SVG_RU_SVG = 'assets/svg/ru.svg';
|
||||
|
||||
static const String ASSETS_SVG_UK_SVG = 'assets/svg/uk.svg';
|
||||
}
|
||||
@ -13,10 +13,10 @@ class Debounce {
|
||||
static Timer? _timer;
|
||||
|
||||
static void run(
|
||||
VoidCallback action, {
|
||||
Duration delay = const Duration(milliseconds: 5000),
|
||||
}) {
|
||||
VoidCallback action, {
|
||||
Duration delay = const Duration(milliseconds: 5000),
|
||||
}) {
|
||||
_timer?.cancel();
|
||||
_timer = Timer(delay, action);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
typedef OnErrorCallback = void Function(String? error)?;
|
||||
typedef OnErrorCallback = void Function(String? error)?;
|
||||
|
||||
@ -17,9 +17,8 @@ class AlbumDto {
|
||||
data: (json['data'] as List<dynamic>?)
|
||||
?.map((e) => AlbumDataDto.fromJson(e as Map<String, dynamic>))
|
||||
.toList(),
|
||||
pagination: json['pagination'] != null
|
||||
? AlbumPaginationDto.fromJson(json['pagination'])
|
||||
: null,
|
||||
pagination:
|
||||
json['pagination'] != null ? AlbumPaginationDto.fromJson(json['pagination']) : null,
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -86,9 +85,7 @@ class AlbumDataDto {
|
||||
tracks: (json['tracks'] as List<dynamic>?)?.map((e) => e as String).toList(),
|
||||
summary: json['summary'],
|
||||
url: json['url'],
|
||||
images: json['images'] != null
|
||||
? AlbumDataImagesDto.fromJson(json['images'])
|
||||
: null,
|
||||
images: json['images'] != null ? AlbumDataImagesDto.fromJson(json['images']) : null,
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -105,9 +102,7 @@ class AlbumDataImagesDto {
|
||||
// Метод для конструирования экземпляра
|
||||
static AlbumDataImagesDto fromJson(Map<String, dynamic> json) {
|
||||
return AlbumDataImagesDto(
|
||||
jpg: json['jpg'] != null
|
||||
? AlbumDataImagesJPGDto.fromJson(json['jpg'])
|
||||
: null,
|
||||
jpg: json['jpg'] != null ? AlbumDataImagesJPGDto.fromJson(json['jpg']) : null,
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -127,4 +122,4 @@ class AlbumDataImagesJPGDto {
|
||||
image_url: json['image_url'],
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,11 +7,15 @@ import 'package:uuid/uuid.dart';
|
||||
|
||||
import '../../home_page/home_page.dart';
|
||||
|
||||
String generateAlbumId(String name, String artist, String url) {
|
||||
// Простой способ создания уникального идентификатора
|
||||
return '$name|$artist|$url';
|
||||
}
|
||||
|
||||
extension AlbumDataDtoMapper on AlbumDataDto {
|
||||
List<AlbumDataDto> fetchAlbums(List<dynamic> albumsData) {
|
||||
const String defaultImageUrl = "https://i.ibb.co/VwCkRD4/image.jpg";
|
||||
List<AlbumDataDto> albums = [];
|
||||
final Uuid uuid = Uuid();
|
||||
|
||||
for (var album in albumsData) {
|
||||
// Ищем изображение с самым большим размером
|
||||
@ -20,22 +24,22 @@ extension AlbumDataDtoMapper on AlbumDataDto {
|
||||
// Ищем наиболее подходящее изображение
|
||||
List<dynamic> images = album['image'] as List<dynamic>;
|
||||
var largestImage = images.firstWhere(
|
||||
(image) => image['size'] == 'mega',
|
||||
(image) => image['size'] == 'mega',
|
||||
orElse: () => images.firstWhere(
|
||||
(image) => image['size'] == 'extralarge',
|
||||
(image) => image['size'] == 'extralarge',
|
||||
orElse: () => images.firstWhere(
|
||||
(image) => image['size'] == 'large',
|
||||
(image) => image['size'] == 'large',
|
||||
orElse: () => null, // запасной вариант
|
||||
),
|
||||
),
|
||||
);
|
||||
if(largestImage['#text'] != "")
|
||||
if (largestImage['#text'] != "")
|
||||
albumImage = largestImage['#text'] as String?;
|
||||
else
|
||||
albumImage = defaultImageUrl;
|
||||
|
||||
if (album['name'] != "(null)" && album['artist'] != "(null)") {
|
||||
final id = uuid.v4();
|
||||
final id = generateAlbumId(album['name'], album['artist'], album['url']);
|
||||
albums.add(AlbumDataDto(
|
||||
id: id,
|
||||
title: album['name'] as String?,
|
||||
@ -61,23 +65,20 @@ extension AlbumDataDtoMapper on AlbumDataDto {
|
||||
List<String> genres = [];
|
||||
|
||||
// Находим год в тегах
|
||||
year = (data['album']?['tags']?['tag'] as List)
|
||||
.firstWhere(
|
||||
year = (data['album']?['tags']?['tag'] as List).firstWhere(
|
||||
(tag) => tag['name'].contains(RegExp(r'^\d{4}$')),
|
||||
orElse: () => null,
|
||||
)?['name'] ?? "_";
|
||||
orElse: () => null,
|
||||
)?['name'] ??
|
||||
"_";
|
||||
|
||||
// Получаем список жанров
|
||||
genres = List<String>.from(
|
||||
(data['album']?['tags']?['tag'] as List<dynamic>? ?? [])
|
||||
.map((tag) => tag['name'] as String)
|
||||
);
|
||||
genres = List<String>.from((data['album']?['tags']?['tag'] as List<dynamic>? ?? [])
|
||||
.map((tag) => tag['name'] as String));
|
||||
|
||||
// Заполняем список треков
|
||||
List<String> tracks = List<String>.from(
|
||||
(data['album']?['tracks']?['track'] as List<dynamic>? ?? [])
|
||||
.map((track) => track['name'] as String)
|
||||
);
|
||||
.map((track) => track['name'] as String));
|
||||
|
||||
// Обновляем информацию в нашем DTO альбома
|
||||
album.year = year;
|
||||
@ -85,8 +86,7 @@ extension AlbumDataDtoMapper on AlbumDataDto {
|
||||
album.tracks = tracks;
|
||||
|
||||
// Обновляем дополнительную информацию, если необходимо
|
||||
album.summary =
|
||||
data['album']?['wiki']?['summary'] ?? "missing"; // или аналогичное поле
|
||||
album.summary = data['album']?['wiki']?['summary'] ?? "missing"; // или аналогичное поле
|
||||
}
|
||||
|
||||
return album; // возвращаем заполненное DTO
|
||||
@ -120,9 +120,7 @@ extension AlbumDtoMapper on AlbumDto {
|
||||
HomeData toDomain() {
|
||||
return HomeData(
|
||||
data: data?.map((e) => e.toDomain()).toList(),
|
||||
nextPage: (pagination?.hasNextPage ?? false)
|
||||
? ((pagination?.currentPage ?? 0) + 1)
|
||||
: null,
|
||||
nextPage: (pagination?.hasNextPage ?? false) ? ((pagination?.currentPage ?? 0) + 1) : null,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -21,8 +21,7 @@ class AlbumRepository extends ApiInterface {
|
||||
// Метод для загрузки списка альбомов по названию с учетом пагинации
|
||||
@override
|
||||
Future<List<CardData>?> loadData({String? albumName, int page = 1, int pageSize = 5}) async {
|
||||
if (albumName == null || albumName == "")
|
||||
albumName = 'a';
|
||||
if (albumName == null || albumName == "") albumName = 'a';
|
||||
final String url =
|
||||
'https://ws.audioscrobbler.com/2.0/?method=album.search&album=$albumName&api_key=$apiKey&format=json&limit=$pageSize&page=$page';
|
||||
|
||||
@ -31,8 +30,7 @@ class AlbumRepository extends ApiInterface {
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
final List<AlbumDataDto> albumsData =
|
||||
AlbumDataDto().fetchAlbums(
|
||||
response.data['results']['albummatches']['album']);
|
||||
AlbumDataDto().fetchAlbums(response.data['results']['albummatches']['album']);
|
||||
|
||||
return albumsData.map((album) => album.toDomain()).toList();
|
||||
} else {
|
||||
@ -60,4 +58,4 @@ class AlbumRepository extends ApiInterface {
|
||||
throw Exception('Error during fetching album info: $e');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -54,11 +54,7 @@ class _DetailsPageState extends State<DetailsPage> {
|
||||
backgroundColor: const Color(0xFF231a24),
|
||||
title: Text(
|
||||
widget.data.title,
|
||||
style: Theme
|
||||
.of(context)
|
||||
.textTheme
|
||||
.headlineLarge
|
||||
?.copyWith(color: Colors.orange),
|
||||
style: Theme.of(context).textTheme.headlineLarge?.copyWith(color: Colors.orange),
|
||||
),
|
||||
),
|
||||
body: Container(
|
||||
@ -69,13 +65,12 @@ class _DetailsPageState extends State<DetailsPage> {
|
||||
if (snapshot.connectionState == ConnectionState.waiting) {
|
||||
return const Center(child: CircularProgressIndicator());
|
||||
} else if (snapshot.hasError) {
|
||||
return Center(child: Text('Error: ${snapshot.error}', style: Theme
|
||||
.of(context)
|
||||
.textTheme
|
||||
.bodyLarge));
|
||||
return Center(
|
||||
child: Text('Error: ${snapshot.error}',
|
||||
style: Theme.of(context).textTheme.bodyLarge));
|
||||
} else if (!snapshot.hasData || snapshot.data == null) {
|
||||
return const Center(child: Text(
|
||||
'No data available', style: TextStyle(color: Colors.white)));
|
||||
return const Center(
|
||||
child: Text('No data available', style: TextStyle(color: Colors.white)));
|
||||
} else {
|
||||
AlbumDataDto albumDetails = snapshot.data!;
|
||||
|
||||
@ -86,9 +81,9 @@ class _DetailsPageState extends State<DetailsPage> {
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 16.0),
|
||||
child: ClipRRect(
|
||||
borderRadius: const BorderRadius.all(Radius.circular(
|
||||
20)),
|
||||
child: Image.network( widget.data.imageUrl ?? '',
|
||||
borderRadius: const BorderRadius.all(Radius.circular(20)),
|
||||
child: Image.network(
|
||||
widget.data.imageUrl ?? '',
|
||||
height: 300,
|
||||
width: double.infinity,
|
||||
fit: BoxFit.cover,
|
||||
@ -113,10 +108,7 @@ class _DetailsPageState extends State<DetailsPage> {
|
||||
|
||||
Widget _buildInfoBlock(AlbumDataDto albumDetails) {
|
||||
return Container(
|
||||
width: MediaQuery
|
||||
.of(context)
|
||||
.size
|
||||
.width,
|
||||
width: MediaQuery.of(context).size.width,
|
||||
margin: const EdgeInsets.only(top: 16, left: 5, right: 5),
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
@ -128,11 +120,7 @@ class _DetailsPageState extends State<DetailsPage> {
|
||||
children: [
|
||||
Text(
|
||||
widget.data.title,
|
||||
style: Theme
|
||||
.of(context)
|
||||
.textTheme
|
||||
.headlineLarge
|
||||
?.copyWith(color: Colors.orange),
|
||||
style: Theme.of(context).textTheme.headlineLarge?.copyWith(color: Colors.orange),
|
||||
),
|
||||
Text(
|
||||
'Artist:',
|
||||
@ -169,10 +157,7 @@ class _DetailsPageState extends State<DetailsPage> {
|
||||
|
||||
Widget _buildTracksBlock(AlbumDataDto albumDetails) {
|
||||
return Container(
|
||||
width: MediaQuery
|
||||
.of(context)
|
||||
.size
|
||||
.width,
|
||||
width: MediaQuery.of(context).size.width,
|
||||
margin: const EdgeInsets.only(top: 16, left: 5, right: 5),
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
@ -185,15 +170,10 @@ class _DetailsPageState extends State<DetailsPage> {
|
||||
children: [
|
||||
Text(
|
||||
'Tracks:',
|
||||
style: Theme
|
||||
.of(context)
|
||||
.textTheme
|
||||
.headlineSmall
|
||||
?.copyWith(color: Colors.orange),
|
||||
style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.orange),
|
||||
),
|
||||
SizedBox(height: 8.0),
|
||||
...albumDetails.tracks!.map((track) =>
|
||||
Padding(
|
||||
...albumDetails.tracks!.map((track) => Padding(
|
||||
padding: const EdgeInsets.only(bottom: 4.0),
|
||||
child: Row(
|
||||
children: [
|
||||
@ -205,11 +185,7 @@ class _DetailsPageState extends State<DetailsPage> {
|
||||
// Отступ между иконкой и текстом
|
||||
Text(
|
||||
track,
|
||||
style: Theme
|
||||
.of(context)
|
||||
.textTheme
|
||||
.bodyMedium
|
||||
?.copyWith(color: Colors.white),
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white),
|
||||
),
|
||||
],
|
||||
),
|
||||
@ -221,10 +197,7 @@ class _DetailsPageState extends State<DetailsPage> {
|
||||
|
||||
Widget _buildSummaryBlock(AlbumDataDto albumDetails) {
|
||||
return Container(
|
||||
width: MediaQuery
|
||||
.of(context)
|
||||
.size
|
||||
.width,
|
||||
width: MediaQuery.of(context).size.width,
|
||||
margin: const EdgeInsets.only(top: 16, left: 5, right: 5),
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
@ -237,23 +210,15 @@ class _DetailsPageState extends State<DetailsPage> {
|
||||
children: [
|
||||
Text(
|
||||
'Summary:',
|
||||
style: Theme
|
||||
.of(context)
|
||||
.textTheme
|
||||
.headlineSmall
|
||||
?.copyWith(color: Colors.orange),
|
||||
style: Theme.of(context).textTheme.headlineSmall?.copyWith(color: Colors.orange),
|
||||
),
|
||||
SizedBox(height: 8.0), // Отступ между заголовком и текстом
|
||||
Text(
|
||||
'${albumDetails.summary}',
|
||||
style: Theme
|
||||
.of(context)
|
||||
.textTheme
|
||||
.bodyMedium
|
||||
?.copyWith(color: Colors.white),
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,4 +15,4 @@ class HomeLoadDataEvent extends HomeEvent {
|
||||
|
||||
@override
|
||||
List<Object?> get props => [search, nextPage];
|
||||
}
|
||||
}
|
||||
|
||||
@ -28,7 +28,8 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
|
||||
final newDataList = data;
|
||||
existingIds = existingData.map((item) => item.id).toSet();
|
||||
final newData = newDataList?.where((newItem) => !existingIds.contains(newItem.id)).toList();
|
||||
updatedData = HomeData(data: [...existingData, ...?newData], nextPage: (event.nextPage ?? 1) + 1);
|
||||
updatedData =
|
||||
HomeData(data: [...existingData, ...?newData], nextPage: (event.nextPage ?? 1) + 1);
|
||||
} else {
|
||||
updatedData = HomeData(data: data, nextPage: (event.nextPage ?? 1) + 1);
|
||||
}
|
||||
@ -39,4 +40,4 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
|
||||
print("Error loading data: $e");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -24,4 +24,4 @@ class HomeState extends Equatable {
|
||||
|
||||
@override
|
||||
List<Object?> get props => [data, isLoading, isPaginationLoading];
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,24 +1,64 @@
|
||||
part of 'home_page.dart';
|
||||
|
||||
class _CardState extends State<_Card> {
|
||||
bool isLiked = false;
|
||||
typedef onLikeCallback = void Function(String id, String title, bool isLiked)?;
|
||||
|
||||
class _Card extends StatelessWidget {
|
||||
final String title;
|
||||
final String artist;
|
||||
final String year;
|
||||
final List<String> genres;
|
||||
final String? imageUrl;
|
||||
final onLikeCallback onLike;
|
||||
final VoidCallback? onTap;
|
||||
final String id;
|
||||
final bool isLiked;
|
||||
|
||||
const _Card(
|
||||
this.title, {
|
||||
required this.artist,
|
||||
required this.year,
|
||||
required this.genres,
|
||||
this.imageUrl,
|
||||
this.onLike,
|
||||
this.onTap,
|
||||
required this.id,
|
||||
this.isLiked = false,
|
||||
});
|
||||
|
||||
factory _Card.fromData(
|
||||
CardData data, {
|
||||
onLikeCallback onLike,
|
||||
VoidCallback? onTap,
|
||||
bool isLiked = false,
|
||||
}) =>
|
||||
_Card(
|
||||
data.title,
|
||||
artist: data.artist,
|
||||
year: data.year,
|
||||
genres: data.genres,
|
||||
imageUrl: data.imageUrl,
|
||||
onLike: onLike,
|
||||
onTap: onTap,
|
||||
id: data.id,
|
||||
isLiked: isLiked,
|
||||
);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return GestureDetector(
|
||||
onTap: widget.onTap,
|
||||
onTap: onTap,
|
||||
child: Container(
|
||||
margin: const EdgeInsets.only(top: 16, left: 5, right: 5),
|
||||
constraints: const BoxConstraints(minHeight: 140),
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFF231a24),
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(
|
||||
color: Colors.orange,
|
||||
width: 6,
|
||||
),
|
||||
margin: const EdgeInsets.only(top: 16, left: 5, right: 5),
|
||||
constraints: const BoxConstraints(minHeight: 140),
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFF231a24),
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(
|
||||
color: Colors.orange,
|
||||
width: 6,
|
||||
),
|
||||
),
|
||||
child: IntrinsicHeight(
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
@ -30,31 +70,40 @@ class _CardState extends State<_Card> {
|
||||
width: 140,
|
||||
height: 100,
|
||||
child: Image.network(
|
||||
widget.imageUrl ?? '',
|
||||
imageUrl ?? '',
|
||||
fit: BoxFit.cover,
|
||||
errorBuilder: (_, __, ___) => const Placeholder(),
|
||||
),
|
||||
),
|
||||
),
|
||||
Flexible(
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(left: 16.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
widget.title,
|
||||
title,
|
||||
style: Theme.of(context)
|
||||
.textTheme
|
||||
.headlineLarge
|
||||
?.copyWith(color: Colors.orange), // Грязно-белый цвет
|
||||
.headlineSmall
|
||||
?.copyWith(color: Colors.orange),
|
||||
),
|
||||
Text(
|
||||
widget.artist,
|
||||
artist,
|
||||
style: Theme.of(context)
|
||||
.textTheme
|
||||
.bodyMedium
|
||||
?.copyWith(color: Color(0xFFDCDCDC)), // Грязно-белый цвет
|
||||
?.copyWith(color: Color(0xFFDCDCDC)),
|
||||
),
|
||||
// Здесь можно добавить отображение года и жанров, если это необходимо
|
||||
Text(
|
||||
year,
|
||||
style: Theme.of(context).textTheme.bodyMedium,
|
||||
),
|
||||
Text(
|
||||
genres.join(', '),
|
||||
style: Theme.of(context).textTheme.bodyMedium,
|
||||
),
|
||||
],
|
||||
),
|
||||
@ -63,24 +112,20 @@ class _CardState extends State<_Card> {
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 8.0, right: 16, bottom: 16),
|
||||
child: GestureDetector(
|
||||
onTap: () {
|
||||
setState(() {
|
||||
isLiked = !isLiked;
|
||||
});
|
||||
widget.onLike?.call(widget.title, isLiked);
|
||||
},
|
||||
onTap: () => onLike?.call(id, title, isLiked),
|
||||
child: AnimatedSwitcher(
|
||||
duration: const Duration(milliseconds: 300),
|
||||
child: isLiked
|
||||
? const Icon(
|
||||
Icons.favorite,
|
||||
color: Colors.pink,
|
||||
key: ValueKey<int>(0),
|
||||
)
|
||||
Icons.favorite,
|
||||
color: Colors.redAccent,
|
||||
key: ValueKey<int>(0),
|
||||
)
|
||||
: const Icon(
|
||||
Icons.favorite_border_outlined,
|
||||
color: Colors.purple),
|
||||
key: ValueKey<int>(1),
|
||||
Icons.favorite_border,
|
||||
color: Colors.purple,
|
||||
key: ValueKey<int>(1),
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
@ -90,51 +135,4 @@ class _CardState extends State<_Card> {
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
typedef onLikeCallback = void Function(String title, bool isLiked)?;
|
||||
|
||||
class _Card extends StatefulWidget {
|
||||
final String title;
|
||||
final String artist;
|
||||
final String year;
|
||||
final List<String> genres;
|
||||
final String? imageUrl;
|
||||
final onLikeCallback onLike;
|
||||
final VoidCallback? onTap;
|
||||
|
||||
const _Card(this.title,
|
||||
{required this.artist, required this.year, required this.genres, this.imageUrl, this.onLike, this.onTap});
|
||||
|
||||
factory _Card.fromData(CardData data, {onLikeCallback? onLike, VoidCallback? onTap}) {
|
||||
// Инициализация изображений альбома
|
||||
AlbumDataImagesJPGDto imagesJPGDto = AlbumDataImagesJPGDto(
|
||||
image_url: data.imageUrl, // Это URL изображений
|
||||
);
|
||||
|
||||
AlbumDataImagesDto imagesDto = AlbumDataImagesDto(
|
||||
jpg: imagesJPGDto,
|
||||
);
|
||||
|
||||
// Создаем DTO альбома
|
||||
AlbumDataDto albumDto = AlbumDataDto(
|
||||
title: data.title,
|
||||
artist: data.artist,
|
||||
images: imagesDto,
|
||||
);
|
||||
|
||||
// Предполагается, что year и genres уже есть в data
|
||||
return _Card(
|
||||
albumDto.title ?? 'UNKNOWN',
|
||||
artist: albumDto.artist ?? 'UNKNOWN',
|
||||
year: data.year,
|
||||
genres: data.genres,
|
||||
imageUrl: data.imageUrl,
|
||||
onLike: onLike,
|
||||
onTap: onTap,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
State<_Card> createState() => _CardState();
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:pmd_labs/components/extension/context_x.dart';
|
||||
import 'package:pmd_labs/components/utils/debounce.dart';
|
||||
import 'package:pmd_labs/data/repositories/album_repository.dart';
|
||||
import 'package:pmd_labs/details_page/detail_page.dart';
|
||||
@ -9,6 +10,13 @@ import 'package:pmd_labs/home_page/bloc/state.dart';
|
||||
import 'package:pmd_labs/card_data.dart';
|
||||
|
||||
import '../data/dto/album_dto.dart';
|
||||
import '../like_bloc/like_bloc.dart';
|
||||
import '../like_bloc/like_event.dart';
|
||||
import '../like_bloc/like_state.dart';
|
||||
import '../locale_bloc/locale_bloc.dart';
|
||||
import '../locale_bloc/locale_events.dart';
|
||||
import '../locale_bloc/locale_state.dart';
|
||||
import '../svg_objects.dart';
|
||||
import 'bloc/home_bloc.dart';
|
||||
|
||||
part 'card.dart';
|
||||
@ -30,10 +38,7 @@ class _MyHomePageState extends State<MyHomePage> {
|
||||
backgroundColor: const Color(0xFF231a24),
|
||||
title: Text(
|
||||
widget.title,
|
||||
style: Theme.of(context)
|
||||
.textTheme
|
||||
.headlineLarge
|
||||
?.copyWith(color: Colors.orange),
|
||||
style: Theme.of(context).textTheme.headlineLarge?.copyWith(color: Colors.orange),
|
||||
),
|
||||
),
|
||||
body: Container(
|
||||
@ -59,12 +64,14 @@ class _BodyState extends State<Body> {
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState(); // Настройка времени дебаунса
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
SvgObjects.init();
|
||||
WidgetsBinding.instance.addPostFrameCallback((_){
|
||||
context.read<HomeBloc>().add(const HomeLoadDataEvent());
|
||||
context.read<LikeBloc>().add(const LoadLikesEvent());
|
||||
});
|
||||
|
||||
scrollController.addListener(_onNextPageListener);
|
||||
super.initState();
|
||||
}
|
||||
|
||||
void _onNextPageListener() {
|
||||
@ -82,7 +89,7 @@ class _BodyState extends State<Body> {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
|
||||
content: Text(
|
||||
'Лайк на $title ${isLiked ? 'поставлен' : 'убран'}',
|
||||
'$title ${isLiked ? context.locale.liked : context.locale.disliked}',
|
||||
style: Theme.of(context).textTheme.bodyLarge,
|
||||
),
|
||||
backgroundColor: Colors.orangeAccent,
|
||||
@ -91,11 +98,20 @@ class _BodyState extends State<Body> {
|
||||
});
|
||||
}
|
||||
|
||||
void _onLike(String id, String title, bool isLiked) {
|
||||
print("$id $title, $isLiked");
|
||||
context.read<LikeBloc>().add(ChangeLikeEvent(id));
|
||||
_showSnackbar(context, title, !isLiked);
|
||||
}
|
||||
|
||||
void _navToDetails(BuildContext context, CardData data) {
|
||||
Navigator.push(
|
||||
context,
|
||||
CupertinoPageRoute(builder: (context) => DetailsPage(data))
|
||||
);
|
||||
Navigator.push(context, CupertinoPageRoute(builder: (context) => DetailsPage(data)));
|
||||
}
|
||||
Future<void> _onRefresh() {
|
||||
context
|
||||
.read<HomeBloc>()
|
||||
.add(HomeLoadDataEvent(search: searchController.text));
|
||||
return Future.value(null);
|
||||
}
|
||||
|
||||
@override
|
||||
@ -106,46 +122,68 @@ class _BodyState extends State<Body> {
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(12),
|
||||
child: CupertinoSearchTextField(
|
||||
controller: searchController,
|
||||
onChanged: (search) {
|
||||
Debounce.run(() {
|
||||
context.read<HomeBloc>().add(HomeLoadDataEvent(search: search));
|
||||
});
|
||||
},
|
||||
style: TextStyle(color: Colors.orange, fontFamily: 'Correction_Tape'),
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: BlocBuilder<HomeBloc, HomeState>(
|
||||
builder: (context, state) {
|
||||
if (state.isLoading) {
|
||||
return const Center(child: CircularProgressIndicator());
|
||||
}
|
||||
return RefreshIndicator(
|
||||
onRefresh: () async {
|
||||
// Добавим состояние загрузки
|
||||
context.read<HomeBloc>().add(HomeLoadDataEvent(search: searchController.text));
|
||||
},
|
||||
child: ListView.builder(
|
||||
controller: scrollController,
|
||||
padding: EdgeInsets.zero,
|
||||
itemCount: state.data?.data?.length ?? 0,
|
||||
itemBuilder: (context, index) {
|
||||
final cardData = state.data?.data?[index];
|
||||
return cardData != null
|
||||
? _Card.fromData(
|
||||
cardData,
|
||||
onLike: (title, isLiked) => _showSnackbar(context, title, isLiked),
|
||||
onTap: () => _navToDetails(context, cardData),
|
||||
)
|
||||
: const SizedBox.shrink();
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: CupertinoSearchTextField(
|
||||
controller: searchController,
|
||||
placeholder: context.locale.search,
|
||||
onChanged: (search) {
|
||||
Debounce.run(() {
|
||||
context.read<HomeBloc>().add(HomeLoadDataEvent(search: search));
|
||||
});
|
||||
},
|
||||
style: TextStyle(color: Colors.orange, fontFamily: 'Correction_Tape'),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
// GestureDetector размещен справа от поля поиска
|
||||
GestureDetector(
|
||||
onTap: () =>
|
||||
context.read<LocaleBloc>().add(const ChangeLocaleEvent()),
|
||||
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.isLoading
|
||||
? CircularProgressIndicator()
|
||||
: BlocBuilder<LikeBloc, LikeState>(
|
||||
builder: (context, likeState) => Expanded(
|
||||
child: RefreshIndicator(
|
||||
onRefresh: _onRefresh,
|
||||
child: ListView.builder(
|
||||
controller: scrollController,
|
||||
padding: EdgeInsets.zero,
|
||||
itemCount: state.data?.data?.length ?? 0,
|
||||
itemBuilder: (context, index) {
|
||||
final data = state.data?.data?[index];
|
||||
return data != null
|
||||
? _Card.fromData(
|
||||
data,
|
||||
isLiked: likeState.likedIds
|
||||
?.contains(data.id) ==
|
||||
true,
|
||||
onLike: _onLike,
|
||||
onTap: () =>
|
||||
_navToDetails(context, data),
|
||||
)
|
||||
: const SizedBox.shrink();
|
||||
}),
|
||||
),
|
||||
))),
|
||||
BlocBuilder<HomeBloc, HomeState>(
|
||||
builder: (context, state) {
|
||||
if (state.isPaginationLoading) {
|
||||
@ -161,7 +199,6 @@ class _BodyState extends State<Body> {
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
searchController.dispose();
|
||||
@ -175,4 +212,4 @@ class HomeData {
|
||||
final int? nextPage;
|
||||
|
||||
HomeData({this.data, this.nextPage});
|
||||
}
|
||||
}
|
||||
|
||||
39
lib/like_bloc/like_bloc.dart
Normal file
39
lib/like_bloc/like_bloc.dart
Normal file
@ -0,0 +1,39 @@
|
||||
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();
|
||||
await prefs.setStringList(_likedPrefsKey, updatedList);
|
||||
|
||||
// Отладка
|
||||
print('Saved likes: $updatedList'); // Просто для проверки
|
||||
|
||||
emit(state.copyWith(likedIds: updatedList));
|
||||
}
|
||||
}
|
||||
13
lib/like_bloc/like_event.dart
Normal file
13
lib/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/like_bloc/like_state.dart
Normal file
14
lib/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];
|
||||
}
|
||||
56
lib/like_bloc/like_state.g.dart
Normal file
56
lib/like_bloc/like_state.g.dart
Normal file
@ -0,0 +1,56 @@
|
||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
|
||||
part of 'like_state.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// CopyWithGenerator
|
||||
// **************************************************************************
|
||||
|
||||
abstract class _$LikeStateCWProxy {
|
||||
LikeState likedIds(List<String>? likedIds);
|
||||
|
||||
/// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LikeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
|
||||
///
|
||||
/// Usage
|
||||
/// ```dart
|
||||
/// LikeState(...).copyWith(id: 12, name: "My name")
|
||||
/// ````
|
||||
LikeState call({
|
||||
List<String>? likedIds,
|
||||
});
|
||||
}
|
||||
|
||||
/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfLikeState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfLikeState.copyWith.fieldName(...)`
|
||||
class _$LikeStateCWProxyImpl implements _$LikeStateCWProxy {
|
||||
const _$LikeStateCWProxyImpl(this._value);
|
||||
|
||||
final LikeState _value;
|
||||
|
||||
@override
|
||||
LikeState likedIds(List<String>? likedIds) => this(likedIds: likedIds);
|
||||
|
||||
@override
|
||||
|
||||
/// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LikeState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
|
||||
///
|
||||
/// Usage
|
||||
/// ```dart
|
||||
/// LikeState(...).copyWith(id: 12, name: "My name")
|
||||
/// ````
|
||||
LikeState call({
|
||||
Object? likedIds = const $CopyWithPlaceholder(),
|
||||
}) {
|
||||
return LikeState(
|
||||
likedIds: likedIds == const $CopyWithPlaceholder()
|
||||
? _value.likedIds
|
||||
// ignore: cast_nullable_to_non_nullable
|
||||
: likedIds as List<String>?,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
extension $LikeStateCopyWith on LikeState {
|
||||
/// Returns a callable class that can be used as follows: `instanceOfLikeState.copyWith(...)` or like so:`instanceOfLikeState.copyWith.fieldName(...)`.
|
||||
// ignore: library_private_types_in_public_api
|
||||
_$LikeStateCWProxy get copyWith => _$LikeStateCWProxyImpl(this);
|
||||
}
|
||||
17
lib/locale_bloc/locale_bloc.dart
Normal file
17
lib/locale_bloc/locale_bloc.dart
Normal file
@ -0,0 +1,17 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:pmd_labs/components/locale/l10n/app_locale.dart';
|
||||
import 'package:pmd_labs/locale_bloc/locale_events.dart';
|
||||
import 'package:pmd_labs/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));
|
||||
}
|
||||
}
|
||||
7
lib/locale_bloc/locale_events.dart
Normal file
7
lib/locale_bloc/locale_events.dart
Normal file
@ -0,0 +1,7 @@
|
||||
abstract class LocaleEvent {
|
||||
const LocaleEvent();
|
||||
}
|
||||
|
||||
class ChangeLocaleEvent extends LocaleEvent {
|
||||
const ChangeLocaleEvent();
|
||||
}
|
||||
15
lib/locale_bloc/locale_state.dart
Normal file
15
lib/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];
|
||||
}
|
||||
58
lib/locale_bloc/locale_state.g.dart
Normal file
58
lib/locale_bloc/locale_state.g.dart
Normal file
@ -0,0 +1,58 @@
|
||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
|
||||
part of 'locale_state.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// CopyWithGenerator
|
||||
// **************************************************************************
|
||||
|
||||
abstract class _$LocaleStateCWProxy {
|
||||
LocaleState currentLocale(Locale currentLocale);
|
||||
|
||||
/// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LocaleState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
|
||||
///
|
||||
/// Usage
|
||||
/// ```dart
|
||||
/// LocaleState(...).copyWith(id: 12, name: "My name")
|
||||
/// ````
|
||||
LocaleState call({
|
||||
Locale? currentLocale,
|
||||
});
|
||||
}
|
||||
|
||||
/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfLocaleState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfLocaleState.copyWith.fieldName(...)`
|
||||
class _$LocaleStateCWProxyImpl implements _$LocaleStateCWProxy {
|
||||
const _$LocaleStateCWProxyImpl(this._value);
|
||||
|
||||
final LocaleState _value;
|
||||
|
||||
@override
|
||||
LocaleState currentLocale(Locale currentLocale) =>
|
||||
this(currentLocale: currentLocale);
|
||||
|
||||
@override
|
||||
|
||||
/// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LocaleState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
|
||||
///
|
||||
/// Usage
|
||||
/// ```dart
|
||||
/// LocaleState(...).copyWith(id: 12, name: "My name")
|
||||
/// ````
|
||||
LocaleState call({
|
||||
Object? currentLocale = const $CopyWithPlaceholder(),
|
||||
}) {
|
||||
return LocaleState(
|
||||
currentLocale:
|
||||
currentLocale == const $CopyWithPlaceholder() || currentLocale == null
|
||||
? _value.currentLocale
|
||||
// ignore: cast_nullable_to_non_nullable
|
||||
: currentLocale as Locale,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
extension $LocaleStateCopyWith on LocaleState {
|
||||
/// Returns a callable class that can be used as follows: `instanceOfLocaleState.copyWith(...)` or like so:`instanceOfLocaleState.copyWith.fieldName(...)`.
|
||||
// ignore: library_private_types_in_public_api
|
||||
_$LocaleStateCWProxy get copyWith => _$LocaleStateCWProxyImpl(this);
|
||||
}
|
||||
@ -1,10 +1,17 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:pmd_labs/data/repositories/album_repository.dart';
|
||||
import 'package:pmd_labs/home_page/home_page.dart';
|
||||
|
||||
import 'components/locale/l10n/app_locale.dart';
|
||||
import 'home_page/bloc/home_bloc.dart';
|
||||
import 'home_page/home_page.dart';
|
||||
import 'like_bloc/like_bloc.dart';
|
||||
import 'locale_bloc/locale_bloc.dart';
|
||||
import 'locale_bloc/locale_state.dart';
|
||||
|
||||
void main() {
|
||||
runApp(const MyApp());
|
||||
@ -13,30 +20,51 @@ void main() {
|
||||
class MyApp extends StatelessWidget {
|
||||
const MyApp({super.key});
|
||||
|
||||
// This widget is the root of your application.
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return MaterialApp(
|
||||
title: 'Лабы ПМУ',
|
||||
theme: ThemeData(
|
||||
textTheme: const TextTheme(
|
||||
headlineLarge: TextStyle(fontFamily: 'Correction_Tape'),
|
||||
bodyLarge: TextStyle(fontFamily: 'Correction_Tape'),
|
||||
bodyMedium: TextStyle(fontFamily: 'Correction_Tape'),
|
||||
headlineSmall: TextStyle(fontFamily: 'Correction_Tape'),
|
||||
),
|
||||
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
|
||||
useMaterial3: true,
|
||||
// Устанавливаем локаль по умолчанию
|
||||
final initialLocale = kIsWeb
|
||||
? const Locale('ru') // Измените это на необходимую локаль для веба
|
||||
: Locale(Platform.localeName);// локаль по умолчанию для мобильных приложений или веба
|
||||
|
||||
return BlocProvider<LocaleBloc>(
|
||||
lazy: false,
|
||||
create: (context) => LocaleBloc(initialLocale),
|
||||
child: BlocBuilder<LocaleBloc, LocaleState>(
|
||||
builder: (context, state) {
|
||||
return MaterialApp(
|
||||
title: 'Лабы ПМУ',
|
||||
locale: state.currentLocale,
|
||||
localizationsDelegates: AppLocale.localizationsDelegates,
|
||||
supportedLocales: AppLocale.supportedLocales,
|
||||
debugShowCheckedModeBanner: false,
|
||||
theme: ThemeData(
|
||||
textTheme: const TextTheme(
|
||||
headlineLarge: TextStyle(fontFamily: 'Correction_Tape'),
|
||||
bodyLarge: TextStyle(fontFamily: 'Correction_Tape'),
|
||||
bodyMedium: TextStyle(fontFamily: 'Correction_Tape'),
|
||||
headlineSmall: TextStyle(fontFamily: 'Correction_Tape'),
|
||||
),
|
||||
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
|
||||
useMaterial3: true,
|
||||
),
|
||||
home: RepositoryProvider<AlbumRepository>(
|
||||
lazy: true,
|
||||
create: (_) => AlbumRepository(),
|
||||
child: BlocProvider<LikeBloc>(
|
||||
lazy: false,
|
||||
create: (context) => LikeBloc(),
|
||||
child: BlocProvider<HomeBloc>(
|
||||
lazy: false,
|
||||
create: (context) =>
|
||||
HomeBloc(context.read<AlbumRepository>()),
|
||||
child: const MyHomePage(title: 'Catalog of Music Albums'),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
home: RepositoryProvider<AlbumRepository>(
|
||||
lazy: true,
|
||||
create: (_) => AlbumRepository(),
|
||||
child: BlocProvider<HomeBloc>(
|
||||
lazy: false,
|
||||
create: (context) => HomeBloc(context.read<AlbumRepository>()),
|
||||
child: const MyHomePage(title: 'Catalog of Music Albums'),
|
||||
),
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
34
lib/svg_objects.dart
Normal file
34
lib/svg_objects.dart
Normal file
@ -0,0 +1,34 @@
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:pmd_labs/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);
|
||||
}
|
||||
}
|
||||
252
pubspec.lock
252
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: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.4.2"
|
||||
clock:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -146,10 +162,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: code_builder
|
||||
sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
|
||||
sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.10.0"
|
||||
version: "4.10.1"
|
||||
collection:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -166,6 +182,22 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.1.2"
|
||||
copy_with_extension:
|
||||
dependency: "direct main"
|
||||
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:
|
||||
@ -312,14 +378,30 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.0.2"
|
||||
image:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: image
|
||||
sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.3.0"
|
||||
intl:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: intl
|
||||
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.19.0"
|
||||
io:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: io
|
||||
sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
|
||||
sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.4"
|
||||
version: "1.0.5"
|
||||
js:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -340,10 +422,10 @@ packages:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
name: json_serializable
|
||||
sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
|
||||
sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "6.8.0"
|
||||
version: "6.9.0"
|
||||
leak_tracker:
|
||||
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: "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:
|
||||
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: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.3.3"
|
||||
shared_preferences_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: shared_preferences_android
|
||||
sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.3.4"
|
||||
shared_preferences_foundation:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: shared_preferences_foundation
|
||||
sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.5.3"
|
||||
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:
|
||||
@ -500,10 +694,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: shelf_web_socket
|
||||
sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
|
||||
sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.0"
|
||||
version: "2.0.1"
|
||||
sky_engine:
|
||||
dependency: transitive
|
||||
description: flutter
|
||||
@ -605,6 +799,30 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.7"
|
||||
vector_graphics:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: vector_graphics
|
||||
sha256: "4ac59808bbfca6da38c99f415ff2d3a5d7ca0a6b4809c71d9cf30fba5daf9752"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.10+1"
|
||||
vector_graphics_codec:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: vector_graphics_codec
|
||||
sha256: f3247e7ab0ec77dc759263e68394990edc608fb2b480b80db8aa86ed09279e33
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.10+1"
|
||||
vector_graphics_compiler:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: vector_graphics_compiler
|
||||
sha256: "18489bdd8850de3dd7ca8a34e0c446f719ec63e2bab2e7a8cc66a9028dd76c5a"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.10+1"
|
||||
vector_math:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -653,6 +871,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:
|
||||
@ -663,4 +897,4 @@ packages:
|
||||
version: "3.1.2"
|
||||
sdks:
|
||||
dart: ">=3.5.2 <4.0.0"
|
||||
flutter: ">=3.18.0-18.0.pre.54"
|
||||
flutter: ">=3.24.0"
|
||||
|
||||
73
pubspec.yaml
73
pubspec.yaml
@ -30,10 +30,7 @@ environment:
|
||||
dependencies:
|
||||
flutter:
|
||||
sdk: flutter
|
||||
|
||||
|
||||
# The following adds the Cupertino Icons font to your application.
|
||||
# Use with the CupertinoIcons class for iOS style icons.
|
||||
flutter_svg: 2.0.7
|
||||
cupertino_icons: ^1.0.8
|
||||
json_annotation: ^4.9.0
|
||||
dio: ^5.4.2+1
|
||||
@ -42,64 +39,38 @@ dependencies:
|
||||
uuid: ^3.0.5
|
||||
equatable: ^2.0.7
|
||||
flutter_bloc: ^8.1.6
|
||||
copy_with_extension_gen: ^5.0.4
|
||||
copy_with_extension: ^5.0.4
|
||||
|
||||
flutter_localizations:
|
||||
sdk: flutter
|
||||
intl: ^0.19.0
|
||||
|
||||
shared_preferences: ^2.2.3
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
|
||||
flutter_lints: ^4.0.0
|
||||
|
||||
flutter_launcher_icons: 0.13.1
|
||||
|
||||
build_runner: ^2.4.9
|
||||
json_serializable: ^6.7.1
|
||||
http: ^0.13.3
|
||||
|
||||
# The "flutter_lints" package below contains a set of recommended lints to
|
||||
# encourage good coding practices. The lint set provided by the package is
|
||||
# activated in the `analysis_options.yaml` file located at the root of your
|
||||
# package. See that file for information about deactivating specific lint
|
||||
# rules and activating additional ones.
|
||||
flutter_lints: ^4.0.0
|
||||
flutter_icons:
|
||||
android: "ic_launcher"
|
||||
ios: true
|
||||
image_path: "assets/icon.jpeg"
|
||||
min_sdk_android: 21
|
||||
|
||||
# For information on the generic Dart part of this file, see the
|
||||
# following page: https://dart.dev/tools/pub/pubspec
|
||||
|
||||
# The following section is specific to Flutter packages.
|
||||
flutter:
|
||||
|
||||
# The following line ensures that the Material Icons font is
|
||||
# included with your application, so that you can use the icons in
|
||||
# the material Icons class.
|
||||
generate: true
|
||||
uses-material-design: true
|
||||
|
||||
# To add assets to your application, add an assets section, like this:
|
||||
# assets:
|
||||
# - images/a_dot_burr.jpeg
|
||||
# - images/a_dot_ham.jpeg
|
||||
|
||||
# An image asset can refer to one or more resolution-specific "variants", see
|
||||
# https://flutter.dev/to/resolution-aware-images
|
||||
|
||||
# For details regarding adding assets from package dependencies, see
|
||||
# https://flutter.dev/to/asset-from-package
|
||||
|
||||
|
||||
|
||||
# To add custom fonts to your application, add a fonts section here,
|
||||
# in this "flutter" section. Each entry in this list should have a
|
||||
# "family" key with the font family name, and a "fonts" key with a
|
||||
# list giving the asset and other descriptors for the font. For
|
||||
# example:
|
||||
# fonts:
|
||||
# - family: Schyler
|
||||
# fonts:
|
||||
# - asset: fonts/Schyler-Regular.ttf
|
||||
# - asset: fonts/Schyler-Italic.ttf
|
||||
# style: italic
|
||||
# - family: Trajan Pro
|
||||
# fonts:
|
||||
# - asset: fonts/TrajanPro.ttf
|
||||
# - asset: fonts/TrajanPro_Bold.ttf
|
||||
# weight: 700
|
||||
#
|
||||
# For details regarding fonts from package dependencies,
|
||||
# see https://flutter.dev/to/font-from-package
|
||||
assets:
|
||||
- assets/svg/
|
||||
fonts:
|
||||
- family: Correction_Tape
|
||||
fonts:
|
||||
|
||||
BIN
web/icon.png
Normal file
BIN
web/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 256 KiB |
BIN
web/icons/icon.png
Normal file
BIN
web/icons/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 256 KiB |
@ -24,10 +24,10 @@
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||
<meta name="apple-mobile-web-app-title" content="pmd_labs">
|
||||
<link rel="apple-touch-icon" href="icons/Icon-192.png">
|
||||
<link rel="apple-touch-icon" href="icons/icon.png">
|
||||
|
||||
<!-- Favicon -->
|
||||
<link rel="icon" type="image/png" href="favicon.png"/>
|
||||
<link rel="icon" type="image/png" href="icon.png"/>
|
||||
|
||||
<title>pmd_labs</title>
|
||||
<link rel="manifest" href="manifest.json">
|
||||
|
||||
@ -10,23 +10,23 @@
|
||||
"prefer_related_applications": false,
|
||||
"icons": [
|
||||
{
|
||||
"src": "icons/Icon-192.png",
|
||||
"src": "icons/icon.png",
|
||||
"sizes": "192x192",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "icons/Icon-512.png",
|
||||
"src": "icons/icon.png",
|
||||
"sizes": "512x512",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "icons/Icon-maskable-192.png",
|
||||
"src": "icons/icon.png",
|
||||
"sizes": "192x192",
|
||||
"type": "image/png",
|
||||
"purpose": "maskable"
|
||||
},
|
||||
{
|
||||
"src": "icons/Icon-maskable-512.png",
|
||||
"src": "icons/icon.png",
|
||||
"sizes": "512x512",
|
||||
"type": "image/png",
|
||||
"purpose": "maskable"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user