Skip to content

Commit

Permalink
added smart buttons and perfect chart
Browse files Browse the repository at this point in the history
  • Loading branch information
afzl-wtu committed Jul 25, 2021
1 parent 09ffab7 commit b979017
Show file tree
Hide file tree
Showing 17 changed files with 228 additions and 242 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
triple_i_main_app/pubspec.lock
triple_i_main_app/pubspec.lock
6 changes: 3 additions & 3 deletions triple_i_main_app/lib/bloc/search.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:data_connection_checker/data_connection_checker.dart';
import 'package:connectivity/connectivity.dart';
import 'package:meta/meta.dart';
import 'package:easy_localization/easy_localization.dart';

Expand Down Expand Up @@ -34,9 +34,9 @@ class SearchBloc extends Bloc<SearchEvent, SearchState> {
if (event is FetchSearchResults) {
yield SearchLoading();

final hasConnection = await DataConnectionChecker().hasConnection;
final hasConnection = await Connectivity().checkConnectivity();

if (hasConnection) {
if (hasConnection != ConnectivityResult.none) {
yield* _fetchSearchResults(symbol: event.symbol);
} else {
yield SearchResultsLoadingError(message: 'No internet connection');
Expand Down
7 changes: 4 additions & 3 deletions triple_i_main_app/lib/helpers/gradient_helper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ class CssLike {
}

static Alignment _getEndAlignment(Object angleOrEndAlignment) {
if (angleOrEndAlignment == null) {
return Alignment.bottomCenter;
} else if (angleOrEndAlignment is num) {
// if (angleOrEndAlignment == null) {
// return Alignment.bottomCenter;
//} else
if (angleOrEndAlignment is num) {
final angle = angleOrEndAlignment.toDouble();
return _degreesToAlignment(angle - 90.0);
} else if (angleOrEndAlignment is Alignment) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'package:meta/meta.dart';

import './market_active.dart';

class MarketMoversModelData {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import 'package:meta/meta.dart';

// This is the main model.
class SectorPerformanceModel {
final SectorPerformanceDataModel oneDay;
final SectorPerformanceDataModel fiveDays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
import 'package:meta/meta.dart';

class SectorPerformanceMedataDatatModel {
final String? information;
final String? lastRefreshed;

SectorPerformanceMedataDatatModel({
required this.information,
required this.lastRefreshed
});
SectorPerformanceMedataDatatModel(
{required this.information, required this.lastRefreshed});

factory SectorPerformanceMedataDatatModel.fromJson(Map<String, dynamic> json) {
factory SectorPerformanceMedataDatatModel.fromJson(
Map<String, dynamic> json) {
return SectorPerformanceMedataDatatModel(
information: json['Information'],
lastRefreshed: json['Last Refreshed'],
);
}
}
}
2 changes: 0 additions & 2 deletions triple_i_main_app/lib/models/news/news.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'package:meta/meta.dart';

import './single_new_model.dart';

class NewsDataModel {
Expand Down
5 changes: 2 additions & 3 deletions triple_i_main_app/lib/models/news/single_new_model.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'package:meta/meta.dart';

class SingleNewModel {
final String? source;
final String? title;
Expand Down Expand Up @@ -42,7 +40,8 @@ class SingleNewModel {
[bool finnhub = false]) {
List<SingleNewModel> testList;
finnhub == false
? testList = items!.map((item) => SingleNewModel.fromJson(item)).toList()
? testList =
items!.map((item) => SingleNewModel.fromJson(item)).toList()
: testList =
items!.map((item) => SingleNewModel.fromJsonFinnhub(item)).toList();
print('PP in toList method testList: $testList');
Expand Down
2 changes: 0 additions & 2 deletions triple_i_main_app/lib/models/profile/profile.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'package:meta/meta.dart';

import './stock_profile.dart';
import './stock_quote.dart';
//import './stock_chart.dart';
Expand Down
2 changes: 0 additions & 2 deletions triple_i_main_app/lib/models/profile/stock_chart.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'package:meta/meta.dart';

class StockChart {
final String? date;
final double? open;
Expand Down
18 changes: 5 additions & 13 deletions triple_i_main_app/lib/models/search.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import 'package:meta/meta.dart';

enum ListType {
searchHistory,
searchResults
}
enum ListType { searchHistory, searchResults }

class StockSearch {
final String? symbol;
Expand All @@ -13,13 +8,10 @@ class StockSearch {
});

static List<StockSearch> convertToList(List<dynamic> items) {
return items
.map((item) => StockSearch.fromJson(item))
.toList();
return items.map((item) => StockSearch.fromJson(item)).toList();
}
factory StockSearch.fromJson( Map<String, dynamic> json) {

factory StockSearch.fromJson(Map<String, dynamic> json) {
return StockSearch(symbol: json['1. symbol']);
}

}
}
11 changes: 3 additions & 8 deletions triple_i_main_app/lib/models/storage.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import 'package:meta/meta.dart';

class StorageModel {

final String? symbol;
final String? companyName;

Expand All @@ -11,11 +8,9 @@ class StorageModel {
});

static List<StorageModel> convertToList(List<dynamic> items) {
return items
.map((item) => StorageModel.fromJson(item))
.toList();
return items.map((item) => StorageModel.fromJson(item)).toList();
}

Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();

Expand All @@ -31,4 +26,4 @@ class StorageModel {
companyName: json['companyName'],
);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ class _KChartWidgetState extends State<KChartWidget>
itemExtent: 14.0,
shrinkWrap: true,
itemBuilder: (context, index) {
// ignore: deprecated_member_use_from_same_package
final translations = widget.isChinese
? kChartTranslations['zh_CN']!
: widget.translations.of(context);
Expand Down
Loading

0 comments on commit b979017

Please sign in to comment.