Remake watch wallet view; improve search list results view
This commit is contained in:
parent
77a15338ea
commit
300a6ce5cc
Binary file not shown.
|
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 7.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 331 B After Width: | Height: | Size: 6.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 460 B After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 264 B After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 585 B After Width: | Height: | Size: 7.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 482 B After Width: | Height: | Size: 7.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 284 B After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 719 B After Width: | Height: | Size: 7.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 8.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 492 B After Width: | Height: | Size: 4.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 14 KiB |
|
|
@ -51,7 +51,6 @@ Future<void> main() async {
|
|||
|
||||
HomeProvider _homeProvider = HomeProvider();
|
||||
appPath = await getApplicationDocumentsDirectory();
|
||||
await _homeProvider.createDefaultAvatar();
|
||||
appVersion = await _homeProvider.getAppVersion();
|
||||
prefs = await SharedPreferences.getInstance();
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ import 'package:path_provider/path_provider.dart';
|
|||
|
||||
class CesiumPlusProvider with ChangeNotifier {
|
||||
TextEditingController cesiumName = TextEditingController();
|
||||
bool isComplete = false;
|
||||
Image defaultAvatar(double size) =>
|
||||
Image.asset(('assets/icon_user.png'), height: size);
|
||||
|
||||
Future<List> _buildQuery(_pubkey) async {
|
||||
var queryGetAvatar = json.encode({
|
||||
|
|
@ -77,27 +78,34 @@ class CesiumPlusProvider with ChangeNotifier {
|
|||
return _name;
|
||||
}
|
||||
|
||||
Future<List> getAvatar(String _pubkey) async {
|
||||
Future<Image> getAvatar(String _pubkey, double size) async {
|
||||
List queryOptions = await _buildQuery(_pubkey);
|
||||
final response = await http.post((Uri.parse(queryOptions[0])),
|
||||
|
||||
http.Response response;
|
||||
try {
|
||||
response = await http.post((Uri.parse(queryOptions[0])),
|
||||
body: queryOptions[1], headers: queryOptions[2]);
|
||||
} catch (e) {
|
||||
log.e(e);
|
||||
}
|
||||
final responseJson = json.decode(response.body);
|
||||
if (responseJson['hits']['hits'].toString() == '[]') {
|
||||
return [File(appPath.path + '/default_avatar.png')];
|
||||
}
|
||||
final bool avatarExist =
|
||||
responseJson['hits']['hits'][0]['_source'].containsKey("avatar");
|
||||
if (!avatarExist) {
|
||||
return [File(appPath.path + '/default_avatar.png')];
|
||||
|
||||
if (responseJson['hits']['hits'].toString() == '[]' ||
|
||||
!responseJson['hits']['hits'][0]['_source'].containsKey("avatar")) {
|
||||
return defaultAvatar(size);
|
||||
}
|
||||
|
||||
final _avatar =
|
||||
responseJson['hits']['hits'][0]['_source']['avatar']['_content'];
|
||||
|
||||
var avatarFile =
|
||||
File('${(await getTemporaryDirectory()).path}/avatar_$_pubkey.png');
|
||||
await avatarFile.writeAsBytes(base64.decode(_avatar));
|
||||
isComplete = true;
|
||||
|
||||
return [avatarFile];
|
||||
return Image.file(
|
||||
avatarFile,
|
||||
height: size,
|
||||
fit: BoxFit.cover,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
|
|||
import 'package:gecko/globals.dart';
|
||||
import 'package:gecko/models/my_wallets.dart';
|
||||
import 'package:gecko/models/wallet_data.dart';
|
||||
import 'package:gecko/screens/history.dart';
|
||||
import 'package:gecko/screens/wallet_view.dart';
|
||||
import 'package:graphql_flutter/graphql_flutter.dart';
|
||||
import 'package:jdenticon_dart/jdenticon_dart.dart';
|
||||
import 'package:permission_handler/permission_handler.dart';
|
||||
|
|
@ -81,7 +81,7 @@ class HistoryProvider with ChangeNotifier {
|
|||
if (regExp.hasMatch(pubkey) == true &&
|
||||
pubkey.length > 42 &&
|
||||
pubkey.length < 45) {
|
||||
log.d("C'est une pubkey !!!");
|
||||
log.d("C'est une pubkey !");
|
||||
|
||||
this.pubkey = pubkey;
|
||||
getShortPubkey(pubkey);
|
||||
|
|
@ -101,7 +101,7 @@ class HistoryProvider with ChangeNotifier {
|
|||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(builder: (context) {
|
||||
return HistoryScreen();
|
||||
return WalletViewScreen();
|
||||
}),
|
||||
);
|
||||
notifyListeners();
|
||||
|
|
@ -238,6 +238,7 @@ class HistoryProvider with ChangeNotifier {
|
|||
|
||||
snackCopyKey(context) {
|
||||
const snackBar = SnackBar(
|
||||
padding: EdgeInsets.all(20),
|
||||
content:
|
||||
Text("Cette clé publique a été copié dans votre presse-papier."),
|
||||
duration: Duration(seconds: 2));
|
||||
|
|
|
|||
|
|
@ -100,16 +100,6 @@ class HomeProvider with ChangeNotifier {
|
|||
return _endpoint;
|
||||
}
|
||||
|
||||
Future createDefaultAvatar() async {
|
||||
File defaultAvatar = File(appPath.path + '/default_avatar.png');
|
||||
final bool isAvatarExist = await defaultAvatar.exists();
|
||||
if (!isAvatarExist) {
|
||||
final byteData = await rootBundle.load('assets/icon_user.png');
|
||||
await defaultAvatar.writeAsBytes(byteData.buffer
|
||||
.asUint8List(byteData.offsetInBytes, byteData.lengthInBytes));
|
||||
}
|
||||
}
|
||||
|
||||
T getRandomElement<T>(List<T> list) {
|
||||
final random = Random();
|
||||
var i = random.nextInt(list.length);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
import 'dart:io';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:gecko/globals.dart';
|
||||
import 'package:gecko/models/cesium_plus.dart';
|
||||
|
|
@ -191,40 +190,36 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
|
|||
child: FutureBuilder(
|
||||
future:
|
||||
_cesiumPlusProvider.getAvatar(
|
||||
_historyProvider.pubkey),
|
||||
initialData: [
|
||||
File(appPath.path +
|
||||
'/default_avatar.png')
|
||||
],
|
||||
_historyProvider.pubkey,
|
||||
55),
|
||||
builder: (BuildContext context,
|
||||
AsyncSnapshot<List> _avatar) {
|
||||
// _cesiumPlusProvider.isComplete = true;
|
||||
AsyncSnapshot<Image> _avatar) {
|
||||
if (_avatar.connectionState !=
|
||||
ConnectionState.done) {
|
||||
return Image.file(
|
||||
File(appPath.path +
|
||||
'/default_avatar.png'),
|
||||
height: avatarsSize);
|
||||
}
|
||||
if (_avatar.hasError) {
|
||||
return Image.file(
|
||||
File(appPath.path +
|
||||
'/default_avatar.png'),
|
||||
height: avatarsSize);
|
||||
ConnectionState.done ||
|
||||
_avatar.hasError) {
|
||||
return Stack(children: [
|
||||
_cesiumPlusProvider
|
||||
.defaultAvatar(55),
|
||||
Positioned(
|
||||
top: 8,
|
||||
right: 0,
|
||||
width: 12,
|
||||
height: 12,
|
||||
child:
|
||||
CircularProgressIndicator(
|
||||
strokeWidth: 1,
|
||||
color: orangeC,
|
||||
),
|
||||
),
|
||||
]);
|
||||
}
|
||||
if (_avatar.hasData) {
|
||||
return SingleChildScrollView(
|
||||
padding:
|
||||
const EdgeInsets.all(
|
||||
0.0),
|
||||
child: Image.file(
|
||||
_avatar.data[0],
|
||||
height: avatarsSize));
|
||||
return ClipOval(
|
||||
child: _avatar.data,
|
||||
);
|
||||
}
|
||||
return Image.file(
|
||||
File(appPath.path +
|
||||
'/default_avatar.png'),
|
||||
height: avatarsSize);
|
||||
return _cesiumPlusProvider
|
||||
.defaultAvatar(55);
|
||||
}),
|
||||
),
|
||||
GestureDetector(
|
||||
|
|
@ -448,7 +443,8 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
|
|||
Navigator.pop(context);
|
||||
}),
|
||||
),
|
||||
if (result.isLoading)
|
||||
if (result.isLoading &&
|
||||
_historyProvider.pageInfo['hasPreviousPage'])
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: const <Widget>[
|
||||
|
|
|
|||
|
|
@ -105,8 +105,7 @@ class WalletOptions extends StatelessWidget {
|
|||
const SizedBox(width: 25),
|
||||
InkWell(
|
||||
onTap: () async {
|
||||
File newAvatar =
|
||||
await _walletOptions.changeAvatar();
|
||||
File newAvatar = await _walletOptions.changeAvatar();
|
||||
if (newAvatar != null) {
|
||||
wallet.imageFile = newAvatar;
|
||||
}
|
||||
|
|
@ -123,8 +122,7 @@ class WalletOptions extends StatelessWidget {
|
|||
)),
|
||||
InkWell(
|
||||
onTap: () async {
|
||||
File newAvatar =
|
||||
await _walletOptions.changeAvatar();
|
||||
File newAvatar = await _walletOptions.changeAvatar();
|
||||
if (newAvatar != null) {
|
||||
wallet.imageFile = newAvatar;
|
||||
}
|
||||
|
|
@ -199,12 +197,10 @@ class WalletOptions extends StatelessWidget {
|
|||
return Row(children: <Widget>[
|
||||
ImageFiltered(
|
||||
imageFilter: ImageFilter.blur(
|
||||
sigmaX: _walletOptions.isBalanceBlur
|
||||
? 6
|
||||
: 0,
|
||||
sigmaY: _walletOptions.isBalanceBlur
|
||||
? 5
|
||||
: 0),
|
||||
sigmaX:
|
||||
_walletOptions.isBalanceBlur ? 6 : 0,
|
||||
sigmaY:
|
||||
_walletOptions.isBalanceBlur ? 5 : 0),
|
||||
child: Text(wBalanceUD,
|
||||
style: TextStyle(
|
||||
fontSize: isTall ? 20 : 18,
|
||||
|
|
@ -240,8 +236,8 @@ class WalletOptions extends StatelessWidget {
|
|||
InkWell(
|
||||
key: const Key('renameWallet'),
|
||||
onTap: () async {
|
||||
_isNewNameValid =
|
||||
_walletOptions.editWalletName(wallet.id(),
|
||||
_isNewNameValid = _walletOptions.editWalletName(
|
||||
wallet.id(),
|
||||
isCesium: false);
|
||||
await Future.delayed(
|
||||
const Duration(milliseconds: 30));
|
||||
|
|
@ -264,8 +260,8 @@ class WalletOptions extends StatelessWidget {
|
|||
])),
|
||||
SizedBox(height: 4 * ratio),
|
||||
FutureBuilder(
|
||||
future: _walletOptions
|
||||
.generateQRcode(_walletOptions.pubkey.text),
|
||||
future:
|
||||
_walletOptions.generateQRcode(_walletOptions.pubkey.text),
|
||||
builder: (context, snapshot) {
|
||||
return snapshot.data != null
|
||||
? Image.memory(snapshot.data,
|
||||
|
|
@ -312,8 +308,8 @@ class WalletOptions extends StatelessWidget {
|
|||
onPrimary: Colors.black, // foreground
|
||||
),
|
||||
onPressed: () {
|
||||
Clipboard.setData(ClipboardData(
|
||||
text: _walletOptions.pubkey.text));
|
||||
Clipboard.setData(
|
||||
ClipboardData(text: _walletOptions.pubkey.text));
|
||||
_walletOptions.snackCopyKey(ctx);
|
||||
},
|
||||
child: Row(children: <Widget>[
|
||||
|
|
@ -321,12 +317,17 @@ class WalletOptions extends StatelessWidget {
|
|||
'assets/walletOptions/copy-white.png',
|
||||
),
|
||||
const SizedBox(width: 7),
|
||||
Text('Copier',
|
||||
style: TextStyle(
|
||||
fontSize: 15,
|
||||
color: Colors.grey[50]))
|
||||
]))),
|
||||
]))),
|
||||
Text(
|
||||
'Copier',
|
||||
style:
|
||||
TextStyle(fontSize: 15, color: Colors.grey[50]),
|
||||
)
|
||||
]),
|
||||
),
|
||||
),
|
||||
]),
|
||||
),
|
||||
),
|
||||
SizedBox(height: 10 * ratio),
|
||||
InkWell(
|
||||
key: const Key('displayHistory'),
|
||||
|
|
@ -343,9 +344,10 @@ class WalletOptions extends StatelessWidget {
|
|||
),
|
||||
const SizedBox(width: 22),
|
||||
const Text('Historique des transactions',
|
||||
style:
|
||||
TextStyle(fontSize: 20, color: Colors.black)),
|
||||
]))),
|
||||
style: TextStyle(fontSize: 20, color: Colors.black)),
|
||||
]),
|
||||
),
|
||||
),
|
||||
SizedBox(height: 12 * ratio),
|
||||
InkWell(
|
||||
key: const Key('setDefaultWallet'),
|
||||
|
|
@ -363,11 +365,12 @@ class WalletOptions extends StatelessWidget {
|
|||
child: Row(children: <Widget>[
|
||||
const SizedBox(width: 31),
|
||||
CircleAvatar(
|
||||
backgroundColor: Colors.grey[
|
||||
_walletOptions.isDefaultWallet ? 300 : 500],
|
||||
backgroundColor: Colors
|
||||
.grey[_walletOptions.isDefaultWallet ? 300 : 500],
|
||||
child: Image.asset(
|
||||
'assets/walletOptions/android-checkmark.png',
|
||||
)),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 22),
|
||||
Text(
|
||||
_walletOptions.isDefaultWallet
|
||||
|
|
@ -378,19 +381,19 @@ class WalletOptions extends StatelessWidget {
|
|||
color: _walletOptions.isDefaultWallet
|
||||
? Colors.grey[500]
|
||||
: Colors.black)),
|
||||
]))),
|
||||
]),
|
||||
),
|
||||
),
|
||||
SizedBox(height: 17 * ratio),
|
||||
if (!_walletOptions.isDefaultWallet)
|
||||
InkWell(
|
||||
key: const Key('deleteWallet'),
|
||||
onTap: !_walletOptions.isDefaultWallet
|
||||
? () async {
|
||||
await _walletOptions.deleteWallet(
|
||||
context, wallet);
|
||||
await _walletOptions.deleteWallet(context, wallet);
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
_myWalletProvider.listWallets =
|
||||
_myWalletProvider
|
||||
.readAllWallets(_currentChest);
|
||||
_myWalletProvider.readAllWallets(_currentChest);
|
||||
_myWalletProvider.rebuildWidget();
|
||||
});
|
||||
}
|
||||
|
|
@ -402,12 +405,14 @@ class WalletOptions extends StatelessWidget {
|
|||
),
|
||||
const SizedBox(width: 24),
|
||||
const Text('Supprimer ce portefeuille',
|
||||
style: TextStyle(
|
||||
fontSize: 20, color: Color(0xffD80000))),
|
||||
])),
|
||||
style:
|
||||
TextStyle(fontSize: 20, color: Color(0xffD80000))),
|
||||
]),
|
||||
),
|
||||
]),
|
||||
),
|
||||
),
|
||||
));
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
import 'dart:io';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:gecko/globals.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
|
@ -20,11 +19,8 @@ class SearchResultScreen extends StatelessWidget {
|
|||
HistoryProvider _historyClass =
|
||||
Provider.of<HistoryProvider>(context, listen: false);
|
||||
|
||||
// int nbrResult = 0;
|
||||
int keyID = 0;
|
||||
const double avatarsSize = 50;
|
||||
|
||||
// _searchProvider.searchPubkey();
|
||||
double _avatarSize = 55;
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
|
|
@ -37,9 +33,9 @@ class SearchResultScreen extends StatelessWidget {
|
|||
body: SafeArea(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 20),
|
||||
child:
|
||||
Column(crossAxisAlignment: CrossAxisAlignment.start, children: <
|
||||
Widget>[
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
const SizedBox(height: 30),
|
||||
RichText(
|
||||
text: TextSpan(
|
||||
|
|
@ -66,60 +62,64 @@ class SearchResultScreen extends StatelessWidget {
|
|||
const SizedBox(height: 20),
|
||||
FutureBuilder(
|
||||
future: _searchProvider.searchBlockchain(),
|
||||
// initialData: const [],
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.connectionState == ConnectionState.done) {
|
||||
return Expanded(
|
||||
child: ListView(children: <Widget>[
|
||||
for (G1WalletsList g1Wallet in snapshot.data)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 5),
|
||||
padding:
|
||||
const EdgeInsets.symmetric(horizontal: 5),
|
||||
child: ListTile(
|
||||
key: Key('searchResult${keyID++}'),
|
||||
horizontalTitleGap: 40,
|
||||
contentPadding: const EdgeInsets.all(5),
|
||||
leading: FutureBuilder(
|
||||
future: _cesiumPlusProvider
|
||||
.getAvatar(g1Wallet.pubkey),
|
||||
initialData: [
|
||||
File(appPath.path + '/default_avatar.png')
|
||||
],
|
||||
future: _cesiumPlusProvider.getAvatar(
|
||||
g1Wallet.pubkey, _avatarSize),
|
||||
builder: (BuildContext context,
|
||||
AsyncSnapshot<List> _avatar) {
|
||||
AsyncSnapshot<Image> _avatar) {
|
||||
if (_avatar.connectionState !=
|
||||
ConnectionState.done) {
|
||||
return Image.file(
|
||||
File(appPath.path +
|
||||
'/default_avatar.png'),
|
||||
height: avatarsSize);
|
||||
}
|
||||
if (_avatar.hasError) {
|
||||
return Image.file(
|
||||
File(appPath.path +
|
||||
'/default_avatar.png'),
|
||||
height: avatarsSize);
|
||||
ConnectionState.done ||
|
||||
_avatar.hasError) {
|
||||
return Stack(children: [
|
||||
_cesiumPlusProvider
|
||||
.defaultAvatar(_avatarSize),
|
||||
Positioned(
|
||||
top: 8,
|
||||
right: 0,
|
||||
width: 12,
|
||||
height: 12,
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 1,
|
||||
color: orangeC,
|
||||
),
|
||||
),
|
||||
]);
|
||||
}
|
||||
if (_avatar.hasData) {
|
||||
return SingleChildScrollView(
|
||||
padding: const EdgeInsets.all(0.0),
|
||||
child: Image.file(_avatar.data.single,
|
||||
height: avatarsSize));
|
||||
return ClipOval(child: _avatar.data);
|
||||
}
|
||||
return Image.file(
|
||||
File(appPath.path +
|
||||
'/default_avatar.png'),
|
||||
height: avatarsSize);
|
||||
return _cesiumPlusProvider
|
||||
.defaultAvatar(_avatarSize);
|
||||
}),
|
||||
title: Text(
|
||||
_historyClass.getShortPubkey(g1Wallet.pubkey),
|
||||
title: Row(children: <Widget>[
|
||||
Text(
|
||||
_historyClass
|
||||
.getShortPubkey(g1Wallet.pubkey),
|
||||
style: const TextStyle(
|
||||
fontSize: 15.0, fontFamily: 'Monospace'),
|
||||
fontSize: 18,
|
||||
fontFamily: 'Monospace',
|
||||
fontWeight: FontWeight.w500),
|
||||
textAlign: TextAlign.center),
|
||||
subtitle: Text(g1Wallet?.id?.username ?? '',
|
||||
style: const TextStyle(fontSize: 12.0),
|
||||
]),
|
||||
subtitle: Row(children: <Widget>[
|
||||
Text(g1Wallet?.id?.username ?? '',
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500),
|
||||
textAlign: TextAlign.center),
|
||||
trailing: Text("${g1Wallet.balance} Ğ1",
|
||||
style: const TextStyle(fontSize: 14.0),
|
||||
textAlign: TextAlign.justify),
|
||||
]),
|
||||
dense: false,
|
||||
isThreeLine: false,
|
||||
onTap: () {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,228 @@
|
|||
import 'dart:ui';
|
||||
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:gecko/globals.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:gecko/models/cesium_plus.dart';
|
||||
import 'package:gecko/models/history.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
// import 'package:gecko/models/home.dart';
|
||||
// import 'package:provider/provider.dart';
|
||||
|
||||
// ignore: must_be_immutable
|
||||
class WalletViewScreen extends StatelessWidget {
|
||||
TextEditingController tplController = TextEditingController();
|
||||
|
||||
WalletViewScreen({Key key}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
|
||||
HistoryProvider _historyProvider = Provider.of<HistoryProvider>(context);
|
||||
CesiumPlusProvider _cesiumPlusProvider =
|
||||
Provider.of<CesiumPlusProvider>(context);
|
||||
double _avatarSize = 150;
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
elevation: 0,
|
||||
toolbarHeight: 60 * ratio,
|
||||
title: const SizedBox(
|
||||
height: 22,
|
||||
child: Text('Voir un portefeuille'),
|
||||
)),
|
||||
body: SafeArea(
|
||||
child: Column(children: <Widget>[
|
||||
Container(
|
||||
height: isTall ? 30 : 10,
|
||||
color: yellowC,
|
||||
),
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
yellowC,
|
||||
const Color(0xFFE7811A),
|
||||
],
|
||||
)),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 30),
|
||||
child: Row(children: <Widget>[
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
GestureDetector(
|
||||
key: const Key('copyPubkey'),
|
||||
onTap: () {
|
||||
Clipboard.setData(
|
||||
ClipboardData(text: _historyProvider.pubkey));
|
||||
_historyProvider.snackCopyKey(context);
|
||||
},
|
||||
child: Text(
|
||||
_historyProvider
|
||||
.getShortPubkey(_historyProvider.pubkey),
|
||||
style: const TextStyle(
|
||||
fontSize: 30,
|
||||
fontWeight: FontWeight.w800,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 15),
|
||||
FutureBuilder(
|
||||
future: _cesiumPlusProvider
|
||||
.getName(_historyProvider.pubkey),
|
||||
initialData: '...',
|
||||
builder: (context, snapshot) {
|
||||
return SizedBox(
|
||||
width: 230,
|
||||
child: Text(
|
||||
snapshot.data ?? '-',
|
||||
style: const TextStyle(
|
||||
fontSize: 20, color: Color(0xff814C00)),
|
||||
),
|
||||
);
|
||||
}),
|
||||
const SizedBox(height: 30),
|
||||
]),
|
||||
const Spacer(),
|
||||
Column(children: <Widget>[
|
||||
FutureBuilder(
|
||||
future: _cesiumPlusProvider.getAvatar(
|
||||
_historyProvider.pubkey, _avatarSize),
|
||||
builder: (BuildContext context,
|
||||
AsyncSnapshot<Image> _avatar) {
|
||||
if (_avatar.connectionState != ConnectionState.done ||
|
||||
_avatar.hasError) {
|
||||
return Stack(children: [
|
||||
ClipOval(
|
||||
child: _cesiumPlusProvider
|
||||
.defaultAvatar(_avatarSize),
|
||||
),
|
||||
Positioned(
|
||||
top: 16.5,
|
||||
right: 47.5,
|
||||
width: 55,
|
||||
height: 55,
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 6,
|
||||
color: orangeC,
|
||||
),
|
||||
),
|
||||
]);
|
||||
}
|
||||
if (_avatar.hasData) {
|
||||
return ClipOval(
|
||||
child: _avatar.data,
|
||||
);
|
||||
}
|
||||
return ClipOval(
|
||||
child:
|
||||
_cesiumPlusProvider.defaultAvatar(_avatarSize),
|
||||
);
|
||||
}),
|
||||
const SizedBox(height: 30),
|
||||
]),
|
||||
]),
|
||||
),
|
||||
),
|
||||
SizedBox(height: isTall ? 60 : 30),
|
||||
Row(mainAxisAlignment: MainAxisAlignment.spaceAround, children: [
|
||||
Column(children: <Widget>[
|
||||
SizedBox(
|
||||
height: 120,
|
||||
child: ClipOval(
|
||||
child: Material(
|
||||
color: const Color(0xffFFD58D), // button color
|
||||
child: InkWell(
|
||||
key: const Key('viewHistory'),
|
||||
splashColor: orangeC, // inkwell color
|
||||
child: const Padding(
|
||||
padding: EdgeInsets.all(15),
|
||||
child: Image(
|
||||
image: AssetImage(
|
||||
'assets/walletOptions/clock.png'),
|
||||
height: 90)),
|
||||
onTap: () {
|
||||
null;
|
||||
}),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 9),
|
||||
const Text(
|
||||
"Voir\nl'historique",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
|
||||
),
|
||||
]),
|
||||
Column(children: <Widget>[
|
||||
SizedBox(
|
||||
height: 120,
|
||||
child: ClipOval(
|
||||
child: Material(
|
||||
color: const Color(0xffFFD58D), // button color
|
||||
child: InkWell(
|
||||
key: const Key('copyKey'),
|
||||
splashColor: orangeC, // inkwell color
|
||||
child: const Padding(
|
||||
padding: EdgeInsets.all(20),
|
||||
child: Image(
|
||||
image: AssetImage('assets/copy_key.png'),
|
||||
height: 90)),
|
||||
onTap: () {
|
||||
Clipboard.setData(
|
||||
ClipboardData(text: _historyProvider.pubkey));
|
||||
_historyProvider.snackCopyKey(context);
|
||||
}),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 9),
|
||||
const Text(
|
||||
"Copier\nla clef",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
|
||||
),
|
||||
]),
|
||||
]),
|
||||
const Spacer(),
|
||||
Container(
|
||||
height: 120,
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xff7c94b6),
|
||||
borderRadius: const BorderRadius.all(Radius.circular(100)),
|
||||
border: Border.all(
|
||||
color: const Color(0xFF6c4204),
|
||||
width: 4,
|
||||
),
|
||||
),
|
||||
child: ClipOval(
|
||||
child: Material(
|
||||
color: orangeC, // button color
|
||||
child: InkWell(
|
||||
key: const Key('pay'),
|
||||
splashColor: yellowC, // inkwell color
|
||||
child: const Padding(
|
||||
padding: EdgeInsets.all(16),
|
||||
child: Image(
|
||||
image: AssetImage('assets/vector_white.png'),
|
||||
)),
|
||||
onTap: () {
|
||||
null;
|
||||
}),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 9),
|
||||
const Text(
|
||||
"Faire un\nvirement",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
|
||||
),
|
||||
SizedBox(height: isTall ? 100 : 50)
|
||||
]),
|
||||
));
|
||||
}
|
||||
}
|
||||
20
pubspec.yaml
20
pubspec.yaml
|
|
@ -5,13 +5,16 @@ description: Pay with G1.
|
|||
# pub.dev using `pub publish`. This is preferred for private packages.
|
||||
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
||||
|
||||
version: 0.0.3+7
|
||||
version: 0.0.3+8
|
||||
|
||||
environment:
|
||||
sdk: ">=2.7.0 <3.0.0"
|
||||
|
||||
dependencies:
|
||||
assorted_layout_widgets: ^5.2.1
|
||||
bubble: ^1.2.1
|
||||
carousel_slider: ^4.0.0
|
||||
confirm_dialog: ^1.0.0
|
||||
crypto: ^3.0.1
|
||||
dubp:
|
||||
path: packages/dubp_rs
|
||||
|
|
@ -21,6 +24,7 @@ dependencies:
|
|||
flutter_driver:
|
||||
sdk: flutter
|
||||
flutter_launcher_icons: ^0.9.2
|
||||
flutter_lints: ^1.0.4
|
||||
flutter_logs: ^2.1.4
|
||||
flutter_svg: ^0.22.0
|
||||
graphql_flutter: ^5.0.0
|
||||
|
|
@ -29,6 +33,7 @@ dependencies:
|
|||
http: ^0.13.4
|
||||
image_gallery_saver: ^1.6.9
|
||||
image_picker: ^0.8.4
|
||||
infinite_scroll_pagination: ^3.1.0
|
||||
intl: ^0.17.0
|
||||
jdenticon_dart: ^2.0.0
|
||||
logger: ^1.1.0
|
||||
|
|
@ -38,7 +43,7 @@ dependencies:
|
|||
permission_handler: 8.1.6
|
||||
pin_code_fields: ^7.3.0
|
||||
printing: ^5.6.0
|
||||
provider: ^6.0.0
|
||||
provider: ^6.0.1
|
||||
qrscan: ^0.3.2
|
||||
responsive_builder: ^0.4.1
|
||||
responsive_framework: ^0.1.4
|
||||
|
|
@ -48,16 +53,9 @@ dependencies:
|
|||
super_tooltip: ^1.0.1
|
||||
sync_http: ^0.3.0
|
||||
test: ^1.17.10
|
||||
# test_api: ^0.4.7
|
||||
# test: ^1.19.3
|
||||
truncate: ^3.0.1
|
||||
unorm_dart: ^0.2.0
|
||||
xml: ^5.3.0
|
||||
assorted_layout_widgets: ^5.2.1
|
||||
carousel_slider: ^4.0.0
|
||||
flutter_lints: ^1.0.4
|
||||
confirm_dialog: ^1.0.0
|
||||
infinite_scroll_pagination: ^3.1.0
|
||||
|
||||
flutter_icons:
|
||||
android: "ic_launcher"
|
||||
|
|
@ -66,12 +64,12 @@ flutter_icons:
|
|||
cupertino_icons: ^1.0.0
|
||||
|
||||
dev_dependencies:
|
||||
build_runner: ^2.1.2
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
hive_generator: ^1.1.1
|
||||
integration_test:
|
||||
sdk: flutter
|
||||
hive_generator: ^1.1.1
|
||||
build_runner: ^2.1.2
|
||||
|
||||
# The following section is specific to Flutter.
|
||||
flutter:
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ if [[ $1 == "bundle" ]]; then
|
|||
flutter build appbundle --release --target-platform android-arm,android-arm64 --build-name $VERSION --build-number $BUILD
|
||||
else
|
||||
# flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64 --build-name $VERSION --build-number $BUILD
|
||||
# flutter build apk --release --split-per-abi --build-name $VERSION --build-number $BUILD
|
||||
flutter build apk --release --build-name $VERSION --build-number $BUILD
|
||||
flutter build apk --release --split-per-abi --build-name $VERSION --build-number $BUILD
|
||||
# flutter build apk --release --build-name $VERSION --build-number $BUILD
|
||||
fi
|
||||
|
||||
if [[ -d $HOME/Téléchargements ]]; then
|
||||
|
|
|
|||
Loading…
Reference in New Issue