This commit is contained in:
platoff84hz 2024-12-02 22:21:30 +04:00
parent 6f93cfbbe7
commit eec421b2ec
9 changed files with 438 additions and 69 deletions

View File

@ -8,22 +8,22 @@ part 'stocks_dto.g.dart';
@JsonSerializable(createToJson: false)
class StocksDto {
final List<StockDataDto>? stocks;
final List<StockDataDto>? instruments;
const StocksDto({this.stocks});
const StocksDto({this.instruments});
factory StocksDto.fromJson(Map<String, dynamic> json) => _$StocksDtoFromJson(json);
}
@JsonSerializable(createToJson: false)
class StockDataDto {
final int? fdcId;
final String? figi;
final String? name;
final double? price;
final String? image;
const StockDataDto({this.fdcId, this.name, this.price, this.image});
const StockDataDto({
this.figi,
this.name,
});
factory StockDataDto.fromJson(Map<String, dynamic> json) => _$StockDataDtoFromJson(json);
}

View File

@ -7,14 +7,13 @@ part of 'stocks_dto.dart';
// **************************************************************************
StocksDto _$StocksDtoFromJson(Map<String, dynamic> json) => StocksDto(
foods: (json['stocks'] as List<dynamic>?)
instruments: (json['instruments'] as List<dynamic>?)
?.map((e) => StockDataDto.fromJson(e as Map<String, dynamic>))
.toList(),
);
StockDataDto _$StockDataDtoFromJson(Map<String, dynamic> json) => StockDataDto(
fdcId: (json['fdcId'] as num?)?.toInt(),
figi: json['figi'] as String?,
name: json['name'] as String?,
price: json['price'] as double?,
image: json['image'] as String?,
);

View File

@ -1,11 +1,9 @@
import 'package:flutter_project/data/dtos/stocks_dto.dart';
import 'package:flutter_project/presentation/home_page/home_page.dart';
extension CharacterDataDtoToModel on StockDataDto {
extension StockDataDtoToModel on StockDataDto {
Stock toDomain() => Stock(
name: name ?? '',
price: price,
imageUrl: image);
}
name: name ?? '',
price: 0.0, // Тут нужно будет добавить логику для получения цены, если API предоставляет её
);
}

View File

@ -19,6 +19,16 @@ class StocksWidget extends StatefulWidget {
}
class _StocksWidgetState extends State<StocksWidget> {
final TextEditingController searchController = TextEditingController();
late Future<List<Stock>?> data;
final repo = StockRepository();
@override
void initState() {
data = repo.loadData();
super.initState();
}
final List<double> prices = [52.90, 77, 89, 111, 135.43, 157.50, 111.11];
Future<void> _fetchNewPrice() async {
@ -52,44 +62,75 @@ class _StocksWidgetState extends State<StocksWidget> {
category: StockCategory.finance),
Stock(),
];
return Center(
child: SingleChildScrollView(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
height: 300,
child: LineChart(
LineChartData(
lineBarsData: [
LineChartBarData(
spots: prices
.asMap()
.map((index, price) => MapEntry(index.toDouble(), FlSpot(index.toDouble(), price)))
.values
.toList(),
isCurved: true,
color: Colors.blue,
barWidth: 3,
dotData: const FlDotData(show: false),
),
],
),
),
),
const SizedBox(height: 20),
ElevatedButton(
onPressed: _fetchNewPrice,
child: const Text('Добавить новую цену'),
),
const SizedBox(height: 20),
// ...stocks.map((e) => StockCard(stock: e)),
...stocks.map((e) => StockCard.fromData(e,
onLike: () => _showSnackBar(context),)).toList(), // .toList()
],
return Column(
children: [
Padding(
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
child: Padding(padding: const EdgeInsets.all(12),
child: CupertinoSearchTextField(
controller: searchController,
onChanged: (Currencies) {
setState(() {
data = repo.loadData(q: Currencies);
});
},
)
),
),
),
SizedBox(
height: 300,
child: LineChart(
LineChartData(
lineBarsData: [
LineChartBarData(
spots: prices
.asMap()
.map((index, price) => MapEntry(index.toDouble(), FlSpot(index.toDouble(), price)))
.values
.toList(),
isCurved: true,
color: Colors.blue,
barWidth: 3,
dotData: const FlDotData(show: false),
),
],
),
),
),
const SizedBox(height: 20),
ElevatedButton(
onPressed: _fetchNewPrice,
child: const Text('Добавить новую цену'),
),
Expanded(
child: Center(
child: FutureBuilder<List<Stock>?>(
future: data,
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return const CircularProgressIndicator();
} else if (snapshot.hasError) {
return Text('Error: ${snapshot.error}');
} else if (!snapshot.hasData ) { // || snapshot.data!.isEmpty
return const Text('No data available');
} else {
return SingleChildScrollView(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: snapshot.data!.map((e) =>
StockCard.fromData(
e,
onLike: () => _showSnackBar(context),
)).toList(),
),
);
}
},
),
),
),
],
);
}

View File

@ -2,6 +2,9 @@ import 'package:flutter/material.dart';
import 'package:fl_chart/fl_chart.dart';
import '../StockCategory.dart';
import '../details_page/details_page.dart';
import 'package:flutter_project/repositories/stock_repository.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
part '../../domain/models/stock.dart';

View File

@ -5,7 +5,6 @@ import 'package:flutter_project/repositories/api_interface.dart';
import 'package:pretty_dio_logger/pretty_dio_logger.dart';
import 'package:dio/dio.dart';
class StockRepository extends ApiInterface {
static final Dio _dio = Dio()
..interceptors.add(
@ -14,21 +13,40 @@ class StockRepository extends ApiInterface {
requestBody: true,
));
static const String _baseUrl = 'https://api.nal.usda.gov';
static const String _baseUrl = 'https://sandbox-invest-public-api.tinkoff.ru/rest/tinkoff.public.invest.api.contract.v1.InstrumentsService';
static const String _token = 't.RxrtXaaIOyJQcHxm16v98TW5zyuFqie_K6cgQPLk-ew4aJDLmqWk3dIMHuLo1aa2P09dZi8Y2BHBrRtqM0UOkA'; // Замените на ваш токен
@override
Future<List<Stock>?> loadData({String? q}) async { // или вместо stock - stockcard
Future<List<Stock>?> loadData({String? q}) async {
try {
final String searchQuery = q ?? 'Stock'; // Используем 'Stock' как значение по умолчанию
final String url = '$_baseUrl/fdc/v1/foods/search?api_key=91xPcWwfSGljSRMuoS8IH0GP4hM9QqwwtgSzqJMw&query=$searchQuery&pageSize=10';
final String searchQuery = q ?? 'Currencies'; // Currencies по умолчанию чтоб вывести просто все акции
final Response<dynamic> response = await _dio.get<Map<dynamic, dynamic>>(url);
final Response<dynamic> response = await _dio.post( //в моей апишки тинькофф сделали все запросы пост (потому что невозможно задудосить)
'$_baseUrl/$searchQuery',
options: Options(
headers: {
'Authorization': 'Bearer $_token',
'Content-Type': 'application/json',
'accept': 'application/json',
},
),
data: {
"instrumentStatus": "INSTRUMENT_STATUS_UNSPECIFIED"
},
);
final StocksDto dto = StocksDto.fromJson(response.data as Map<String, dynamic>);
final List<Stock>? data = dto.stocks?.map((e) => e.toDomain()).toList();
// final List<Stock>? data = dto.stocks?.map((e) => e.toDomain()).toList();
final List<Stock>? data = dto.instruments?.map((e) => e.toDomain()).toList();
if (q != null && q.isNotEmpty) {
return data?.where((stock) => stock.name?.toLowerCase().contains(q.toLowerCase()) ?? false).toList();
}
return data;
} on DioException catch (e) {
// err
print('Dio error: $e');
return null;
}
}

View File

@ -1,6 +1,35 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
_fe_analyzer_shared:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
url: "https://pub.dev"
source: hosted
version: "72.0.0"
_macros:
dependency: transitive
description: dart
source: sdk
version: "0.3.2"
analyzer:
dependency: transitive
description:
name: analyzer
sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
url: "https://pub.dev"
source: hosted
version: "6.7.0"
args:
dependency: transitive
description:
name: args
sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
url: "https://pub.dev"
source: hosted
version: "2.6.0"
async:
dependency: transitive
description:
@ -17,6 +46,70 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.1"
build:
dependency: transitive
description:
name: build
sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
url: "https://pub.dev"
source: hosted
version: "2.4.1"
build_config:
dependency: transitive
description:
name: build_config
sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
url: "https://pub.dev"
source: hosted
version: "1.1.1"
build_daemon:
dependency: transitive
description:
name: build_daemon
sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
url: "https://pub.dev"
source: hosted
version: "4.0.2"
build_resolvers:
dependency: transitive
description:
name: build_resolvers
sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
url: "https://pub.dev"
source: hosted
version: "2.4.2"
build_runner:
dependency: "direct dev"
description:
name: build_runner
sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
url: "https://pub.dev"
source: hosted
version: "2.4.13"
build_runner_core:
dependency: transitive
description:
name: build_runner_core
sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
url: "https://pub.dev"
source: hosted
version: "7.3.2"
built_collection:
dependency: transitive
description:
name: built_collection
sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
url: "https://pub.dev"
source: hosted
version: "5.1.1"
built_value:
dependency: transitive
description:
name: built_value
sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
url: "https://pub.dev"
source: hosted
version: "8.9.2"
characters:
dependency: transitive
description:
@ -25,6 +118,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.3.0"
checked_yaml:
dependency: transitive
description:
name: checked_yaml
sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
url: "https://pub.dev"
source: hosted
version: "2.0.3"
clock:
dependency: transitive
description:
@ -33,6 +134,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.1.1"
code_builder:
dependency: transitive
description:
name: code_builder
sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
url: "https://pub.dev"
source: hosted
version: "4.10.1"
collection:
dependency: transitive
description:
@ -41,6 +150,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.18.0"
convert:
dependency: transitive
description:
name: convert
sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
url: "https://pub.dev"
source: hosted
version: "3.1.2"
crypto:
dependency: transitive
description:
name: crypto
sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
url: "https://pub.dev"
source: hosted
version: "3.0.6"
cupertino_icons:
dependency: "direct main"
description:
@ -49,6 +174,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.8"
dart_style:
dependency: transitive
description:
name: dart_style
sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
url: "https://pub.dev"
source: hosted
version: "2.3.7"
dio:
dependency: "direct main"
description:
@ -81,6 +214,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.3.1"
file:
dependency: transitive
description:
name: file
sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
url: "https://pub.dev"
source: hosted
version: "7.0.1"
fixnum:
dependency: transitive
description:
name: fixnum
sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
url: "https://pub.dev"
source: hosted
version: "1.1.1"
fl_chart:
dependency: "direct main"
description:
@ -107,6 +256,38 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
frontend_server_client:
dependency: transitive
description:
name: frontend_server_client
sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
url: "https://pub.dev"
source: hosted
version: "4.0.0"
glob:
dependency: transitive
description:
name: glob
sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
graphs:
dependency: transitive
description:
name: graphs
sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
url: "https://pub.dev"
source: hosted
version: "2.3.2"
http_multi_server:
dependency: transitive
description:
name: http_multi_server
sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
url: "https://pub.dev"
source: hosted
version: "3.2.1"
http_parser:
dependency: transitive
description:
@ -115,6 +296,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.2"
io:
dependency: transitive
description:
name: io
sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
url: "https://pub.dev"
source: hosted
version: "1.0.4"
js:
dependency: transitive
description:
name: js
sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
url: "https://pub.dev"
source: hosted
version: "0.7.1"
json_annotation:
dependency: "direct main"
description:
@ -155,6 +352,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.0"
logging:
dependency: transitive
description:
name: logging
sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
url: "https://pub.dev"
source: hosted
version: "1.3.0"
macros:
dependency: transitive
description:
name: macros
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
url: "https://pub.dev"
source: hosted
version: "0.1.2-main.4"
matcher:
dependency: transitive
description:
@ -179,6 +392,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.15.0"
mime:
dependency: transitive
description:
name: mime
sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
url: "https://pub.dev"
source: hosted
version: "2.0.0"
package_config:
dependency: transitive
description:
name: package_config
sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
path:
dependency: transitive
description:
@ -187,6 +416,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.9.0"
pool:
dependency: transitive
description:
name: pool
sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
url: "https://pub.dev"
source: hosted
version: "1.5.1"
pretty_dio_logger:
dependency: "direct main"
description:
@ -195,6 +432,38 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.4.0"
pub_semver:
dependency: transitive
description:
name: pub_semver
sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
pubspec_parse:
dependency: transitive
description:
name: pubspec_parse
sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
url: "https://pub.dev"
source: hosted
version: "1.3.0"
shelf:
dependency: transitive
description:
name: shelf
sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
url: "https://pub.dev"
source: hosted
version: "1.4.1"
shelf_web_socket:
dependency: transitive
description:
name: shelf_web_socket
sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
url: "https://pub.dev"
source: hosted
version: "2.0.1"
sky_engine:
dependency: transitive
description: flutter
@ -224,6 +493,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.2"
stream_transform:
dependency: transitive
description:
name: stream_transform
sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
string_scanner:
dependency: transitive
description:
@ -248,14 +525,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.7.2"
tinkoff_sdk:
dependency: "direct main"
timing:
dependency: transitive
description:
name: tinkoff_sdk
sha256: "20cc80ec6f57aa8ed499fb069075cc9d2b1361b369ea9159aad2c1663f54e191"
name: timing
sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
url: "https://pub.dev"
source: hosted
version: "0.6.0"
version: "1.0.1"
typed_data:
dependency: transitive
description:
@ -280,6 +557,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "14.2.5"
watcher:
dependency: transitive
description:
name: watcher
sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
web:
dependency: transitive
description:
@ -288,6 +573,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.1.0"
web_socket:
dependency: transitive
description:
name: web_socket
sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
url: "https://pub.dev"
source: hosted
version: "0.1.6"
web_socket_channel:
dependency: transitive
description:
name: web_socket_channel
sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
yaml:
dependency: transitive
description:
name: yaml
sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
url: "https://pub.dev"
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.5.2 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"

View File

@ -31,7 +31,7 @@ dependencies:
flutter:
sdk: flutter
tinkoff_sdk: ^0.6.0
# tinkoff_sdk: ^0.6.0
fl_chart: ^0.69.0
json_annotation: ^4.8.1
dio: ^5.4.2+1
@ -44,6 +44,7 @@ dev_dependencies:
flutter_test:
sdk: flutter
build_runner: ^2.1.7
# 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