Big clean on home.dart/historyScreen.dart
This commit is contained in:
parent
0a42a17cdd
commit
4143ec55eb
|
@ -1,6 +1,6 @@
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'home.dart';
|
import 'package:gecko/ui/home.dart';
|
||||||
import 'package:graphql_flutter/graphql_flutter.dart';
|
import 'package:graphql_flutter/graphql_flutter.dart';
|
||||||
import 'package:sentry_flutter/sentry_flutter.dart';
|
import 'package:sentry_flutter/sentry_flutter.dart';
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
|
|
|
@ -18,12 +18,12 @@ import 'package:truncate/truncate.dart';
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
|
|
||||||
class HistoryListView extends StatelessWidget {
|
class HistoryElements extends StatelessWidget {
|
||||||
// const String({this.isPubkey});
|
// const String({this.isPubkey});
|
||||||
// final PubkeyCallBack isPubkey;
|
// final PubkeyCallBack isPubkey;
|
||||||
// GlobalKey<MyState> _myKey = GlobalKey();
|
// GlobalKey<MyState> _myKey = GlobalKey();
|
||||||
|
|
||||||
const HistoryListView(
|
const HistoryElements(
|
||||||
{Key key,
|
{Key key,
|
||||||
@required ScrollController scrollController,
|
@required ScrollController scrollController,
|
||||||
@required this.transBC,
|
@required this.transBC,
|
|
@ -1,62 +1,36 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:qrscan/qrscan.dart' as scanner;
|
import 'package:qrscan/qrscan.dart' as scanner;
|
||||||
import 'package:gecko/ui/generateWallets.dart';
|
import 'package:gecko/ui/historyElements.dart';
|
||||||
import 'package:gecko/ui/historyWallets.dart';
|
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'dart:typed_data';
|
import 'dart:typed_data';
|
||||||
import 'dart:ui';
|
import 'dart:ui';
|
||||||
import 'package:graphql_flutter/graphql_flutter.dart';
|
import 'package:graphql_flutter/graphql_flutter.dart';
|
||||||
import 'package:permission_handler/permission_handler.dart';
|
import 'package:permission_handler/permission_handler.dart';
|
||||||
import 'parsingGVA.dart';
|
import 'package:gecko/parsingGVA.dart';
|
||||||
import 'query.dart';
|
import 'package:gecko/query.dart';
|
||||||
import 'package:sentry/sentry.dart' as sentry;
|
import 'package:sentry/sentry.dart' as sentry;
|
||||||
|
|
||||||
// method to call from widget to fetchmore queries
|
|
||||||
typedef FetchMore = dynamic Function(FetchMoreOptions options);
|
|
||||||
|
|
||||||
typedef Refetch = Future<QueryResult> Function();
|
|
||||||
|
|
||||||
typedef QueryBuilder = Widget Function(
|
|
||||||
QueryResult result, {
|
|
||||||
Refetch refetch,
|
|
||||||
FetchMore fetchMore,
|
|
||||||
});
|
|
||||||
|
|
||||||
//ignore: must_be_immutable
|
//ignore: must_be_immutable
|
||||||
class HomeScreen extends StatefulWidget {
|
class HistoryScreen extends StatefulWidget {
|
||||||
// const HistoryListScreen({
|
const HistoryScreen({Key keyHistory}) : super(key: keyHistory);
|
||||||
// final Key key,
|
|
||||||
// @required this.options,
|
|
||||||
// @required this.builder,
|
|
||||||
// }) : super(key: key);
|
|
||||||
|
|
||||||
// final QueryOptions options;
|
|
||||||
// final QueryBuilder builder;
|
|
||||||
|
|
||||||
HomeScreen({this.screens});
|
|
||||||
|
|
||||||
static const Tag = "HistoryListScreen";
|
|
||||||
final List<Widget> screens;
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
_HomeScreenState createState() => _HomeScreenState();
|
State<StatefulWidget> createState() => HistoryScreenState();
|
||||||
}
|
}
|
||||||
|
|
||||||
class _HomeScreenState extends State<HomeScreen> {
|
class HistoryScreenState extends State<HistoryScreen> {
|
||||||
int _currentIndex = 0;
|
int currentIndex = 0;
|
||||||
Widget currentScreen;
|
Widget currentScreen;
|
||||||
|
|
||||||
void onTabTapped(int index) {
|
void onTabTapped(int index) {
|
||||||
setState(() {
|
setState(() {
|
||||||
_currentIndex = index;
|
currentIndex = index;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Uint8List bytes = Uint8List(0);
|
Uint8List bytes = Uint8List(0);
|
||||||
|
|
||||||
final TextEditingController _outputPubkey = new TextEditingController();
|
final TextEditingController _outputPubkey = new TextEditingController();
|
||||||
|
|
||||||
final nRepositories = 20;
|
final nRepositories = 20;
|
||||||
|
|
||||||
// String pubkey = 'D2meevcAHFTS2gQMvmRW5Hzi25jDdikk4nC4u1FkwRaU'; // For debug
|
// String pubkey = 'D2meevcAHFTS2gQMvmRW5Hzi25jDdikk4nC4u1FkwRaU'; // For debug
|
||||||
|
@ -96,53 +70,6 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||||
print('Build pubkey : ' + pubkey);
|
print('Build pubkey : ' + pubkey);
|
||||||
print('Build this.pubkey : ' + this.pubkey);
|
print('Build this.pubkey : ' + this.pubkey);
|
||||||
print('isBuilding: ' + isBuilding.toString());
|
print('isBuilding: ' + isBuilding.toString());
|
||||||
return MaterialApp(
|
|
||||||
home: Scaffold(
|
|
||||||
backgroundColor: Colors.grey[300],
|
|
||||||
body: SafeArea(
|
|
||||||
child: IndexedStack(
|
|
||||||
index: _currentIndex,
|
|
||||||
children: <Widget>[
|
|
||||||
historyScreen(),
|
|
||||||
GenerateWalletScreen(),
|
|
||||||
// FriendsScreen()
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
floatingActionButton: Container(
|
|
||||||
height: 80.0,
|
|
||||||
width: 80.0,
|
|
||||||
child: FittedBox(
|
|
||||||
child: FloatingActionButton(
|
|
||||||
onPressed: () => _scan(),
|
|
||||||
child: Container(
|
|
||||||
height: 40.0,
|
|
||||||
width: 40.0,
|
|
||||||
child: Image.asset('images/scanner.png')),
|
|
||||||
backgroundColor: Color.fromARGB(500, 204, 255, 255),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
bottomNavigationBar: BottomNavigationBar(
|
|
||||||
fixedColor: Colors.black,
|
|
||||||
type: BottomNavigationBarType.fixed,
|
|
||||||
onTap: onTabTapped,
|
|
||||||
currentIndex: _currentIndex,
|
|
||||||
items: [
|
|
||||||
BottomNavigationBarItem(
|
|
||||||
icon: new Icon(Icons.format_list_bulleted),
|
|
||||||
label: 'HOME',
|
|
||||||
),
|
|
||||||
BottomNavigationBarItem(
|
|
||||||
icon: new Icon(Icons.settings),
|
|
||||||
label: 'GENERATE WALLET',
|
|
||||||
)
|
|
||||||
],
|
|
||||||
),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget historyScreen() {
|
|
||||||
return Column(children: <Widget>[
|
return Column(children: <Widget>[
|
||||||
TextField(
|
TextField(
|
||||||
onChanged: (text) {
|
onChanged: (text) {
|
||||||
|
@ -256,7 +183,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||||
List _transBC = parseHistory(blockchainTX);
|
List _transBC = parseHistory(blockchainTX);
|
||||||
|
|
||||||
return Expanded(
|
return Expanded(
|
||||||
child: HistoryListView(
|
child: HistoryElements(
|
||||||
scrollController: _scrollController,
|
scrollController: _scrollController,
|
||||||
transBC: _transBC,
|
transBC: _transBC,
|
||||||
historyData: result),
|
historyData: result),
|
||||||
|
@ -267,7 +194,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
Future _scan() async {
|
Future scan() async {
|
||||||
await Permission.camera.request();
|
await Permission.camera.request();
|
||||||
String barcode;
|
String barcode;
|
||||||
try {
|
try {
|
|
@ -0,0 +1,88 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:gecko/ui/generateWallets.dart';
|
||||||
|
import 'dart:typed_data';
|
||||||
|
import 'dart:ui';
|
||||||
|
import 'package:gecko/ui/historyScreen.dart';
|
||||||
|
|
||||||
|
//ignore: must_be_immutable
|
||||||
|
class HomeScreen extends StatefulWidget {
|
||||||
|
// const HistoryListScreen({
|
||||||
|
// final Key key,
|
||||||
|
// @required this.options,
|
||||||
|
// @required this.builder,
|
||||||
|
// }) : super(key: key);
|
||||||
|
|
||||||
|
// final QueryOptions options;
|
||||||
|
// final QueryBuilder builder;
|
||||||
|
|
||||||
|
HomeScreen({this.screens});
|
||||||
|
final List<Widget> screens;
|
||||||
|
|
||||||
|
@override
|
||||||
|
_HomeScreenState createState() => _HomeScreenState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _HomeScreenState extends State<HomeScreen> {
|
||||||
|
GlobalKey<HistoryScreenState> _keyHistory = GlobalKey();
|
||||||
|
|
||||||
|
int _currentIndex = 0;
|
||||||
|
Widget currentScreen;
|
||||||
|
|
||||||
|
void onTabTapped(int index) {
|
||||||
|
setState(() {
|
||||||
|
_currentIndex = index;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Uint8List bytes = Uint8List(0);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
backgroundColor: Colors.grey[300],
|
||||||
|
body: SafeArea(
|
||||||
|
child: IndexedStack(
|
||||||
|
index: _currentIndex,
|
||||||
|
children: <Widget>[
|
||||||
|
HistoryScreen(
|
||||||
|
keyHistory: _keyHistory,
|
||||||
|
),
|
||||||
|
GenerateWalletScreen(),
|
||||||
|
// FriendsScreen()
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
floatingActionButton: Container(
|
||||||
|
height: 80.0,
|
||||||
|
width: 80.0,
|
||||||
|
child: FittedBox(
|
||||||
|
child: FloatingActionButton(
|
||||||
|
onPressed: () => _keyHistory.currentState.scan(), // _scan(),
|
||||||
|
child: Container(
|
||||||
|
height: 40.0,
|
||||||
|
width: 40.0,
|
||||||
|
child: Image.asset('images/scanner.png')),
|
||||||
|
backgroundColor: Color.fromARGB(500, 204, 255, 255),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
bottomNavigationBar: BottomNavigationBar(
|
||||||
|
fixedColor: Colors.black,
|
||||||
|
type: BottomNavigationBarType.fixed,
|
||||||
|
onTap: onTabTapped,
|
||||||
|
currentIndex: _currentIndex,
|
||||||
|
items: [
|
||||||
|
BottomNavigationBarItem(
|
||||||
|
icon: new Icon(Icons.format_list_bulleted),
|
||||||
|
label: 'HOME',
|
||||||
|
),
|
||||||
|
BottomNavigationBarItem(
|
||||||
|
icon: new Icon(Icons.settings),
|
||||||
|
label: 'GENERATE WALLET',
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue