Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Ğecko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
clients
Ğecko
Commits
5dbec1ac
Commit
5dbec1ac
authored
1 year ago
by
poka
Browse files
Options
Downloads
Patches
Plain Diff
UX: change search button appBar with home
parent
6d16b99c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#34458
waiting for manual action
Stage: format
Stage: build_and_test
Stage: package
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/screens/transaction_in_progress.dart
+124
-123
124 additions, 123 deletions
lib/screens/transaction_in_progress.dart
lib/widgets/bottom_app_bar.dart
+3
-11
3 additions, 11 deletions
lib/widgets/bottom_app_bar.dart
with
127 additions
and
134 deletions
lib/screens/transaction_in_progress.dart
+
124
−
123
View file @
5dbec1ac
...
...
@@ -28,7 +28,6 @@ class TransactionInProgress extends StatelessWidget {
final
myWalletProvider
=
Provider
.
of
<
MyWalletsProvider
>(
context
,
listen:
false
);
bool
isValid
=
false
;
bool
isLoading
=
true
;
final
result
=
sub
.
transactionStatus
;
...
...
@@ -51,6 +50,7 @@ class TransactionInProgress extends StatelessWidget {
'revokeIdty'
:
'revokeAdhesion'
.
tr
(),
'identityMigration'
:
'identityMigration'
.
tr
(),
};
String
resultText
=
''
;
final
Map
<
String
,
String
>
resultMap
=
{
''
:
'sending'
.
tr
(),
...
...
@@ -93,145 +93,146 @@ class TransactionInProgress extends StatelessWidget {
log
.
d
(
"
$transType
::
${actionMap[transType]}
::
$result
"
);
return
WillPopScope
(
onWillPop:
()
{
sub
.
transactionStatus
=
''
;
onWillPop:
()
{
sub
.
transactionStatus
=
''
;
Navigator
.
pop
(
context
);
if
(
transType
==
'identityMigration'
)
{
Navigator
.
pop
(
context
);
if
(
transType
==
'identityMigration'
)
{
Navigator
.
pop
(
context
);
}
return
Future
<
bool
>
.
value
(
true
);
},
child:
Scaffold
(
backgroundColor:
backgroundColor
,
appBar:
AppBar
(
toolbarHeight:
60
*
ratio
,
elevation:
0
,
automaticallyImplyLeading:
false
,
title:
SizedBox
(
height:
22
,
child:
Row
(
mainAxisAlignment:
MainAxisAlignment
.
center
,
children:
<
Widget
>[
Text
(
'extrinsicInProgress'
.
tr
(
args:
[
actionMap
[
transType
]
??
'strangeTransaction'
.
tr
()
]))
]),
)),
body:
SafeArea
(
child:
Align
(
alignment:
FractionalOffset
.
bottomCenter
,
child:
Column
(
children:
<
Widget
>[
Container
(
width:
double
.
infinity
,
decoration:
const
BoxDecoration
(
gradient:
LinearGradient
(
begin:
Alignment
.
topCenter
,
end:
Alignment
.
bottomCenter
,
colors:
[
yellowC
,
backgroundColor
,
],
)),
child:
Column
(
children:
<
Widget
>[
const
SizedBox
(
height:
10
),
if
(
transType
==
'pay'
)
Text
(
isUdUnit
?
'ud'
.
tr
(
args:
[
'
$amount
'
])
:
'
$amount
$currencyName
'
,
textAlign:
TextAlign
.
center
,
style:
const
TextStyle
(
fontSize:
18
,
fontWeight:
FontWeight
.
w600
),
),
if
(
transType
==
'pay'
)
const
SizedBox
(
height:
10
),
Text
(
'fromMinus'
.
tr
(),
textAlign:
TextAlign
.
center
,
style:
const
TextStyle
(
fontSize:
18
),
),
Text
(
from
,
textAlign:
TextAlign
.
center
,
style:
const
TextStyle
(
fontSize:
18
,
fontWeight:
FontWeight
.
w600
),
),
const
SizedBox
(
height:
10
),
Text
(
'toMinus'
.
tr
(),
textAlign:
TextAlign
.
center
,
style:
const
TextStyle
(
fontSize:
18
),
),
}
return
Future
<
bool
>
.
value
(
true
);
},
child:
Scaffold
(
backgroundColor:
backgroundColor
,
appBar:
AppBar
(
toolbarHeight:
60
*
ratio
,
elevation:
0
,
automaticallyImplyLeading:
false
,
title:
SizedBox
(
height:
22
,
child:
Row
(
mainAxisAlignment:
MainAxisAlignment
.
center
,
children:
<
Widget
>[
Text
(
'extrinsicInProgress'
.
tr
(
args:
[
actionMap
[
transType
]
??
'strangeTransaction'
.
tr
()
]))
]),
)),
body:
SafeArea
(
child:
Align
(
alignment:
FractionalOffset
.
bottomCenter
,
child:
Column
(
children:
<
Widget
>[
Container
(
width:
double
.
infinity
,
decoration:
const
BoxDecoration
(
gradient:
LinearGradient
(
begin:
Alignment
.
topCenter
,
end:
Alignment
.
bottomCenter
,
colors:
[
yellowC
,
backgroundColor
,
],
)),
child:
Column
(
children:
<
Widget
>[
const
SizedBox
(
height:
10
),
if
(
transType
==
'pay'
)
Text
(
toUsername
??
to
,
isUdUnit
?
'ud'
.
tr
(
args:
[
'
$amount
'
])
:
'
$amount
$currencyName
'
,
textAlign:
TextAlign
.
center
,
style:
const
TextStyle
(
fontSize:
18
,
fontWeight:
FontWeight
.
w600
),
),
const
SizedBox
(
height:
20
),
]),
),
// const SizedBox(height: 20, width: double.infinity),
const
Spacer
(),
Column
(
children:
[
Visibility
(
visible:
isLoading
,
child:
const
SizedBox
(
height:
18
,
width:
18
,
child:
CircularProgressIndicator
(
color:
orangeC
,
strokeWidth:
2
,
),
),
if
(
transType
==
'pay'
)
const
SizedBox
(
height:
10
),
Text
(
'fromMinus'
.
tr
(),
textAlign:
TextAlign
.
center
,
style:
const
TextStyle
(
fontSize:
18
),
),
Visibility
(
visible:
!
isLoading
,
child:
Icon
(
isValid
?
Icons
.
done_all
:
Icons
.
close
,
size:
35
,
color:
isValid
?
Colors
.
greenAccent
:
Colors
.
redAccent
,
),
Text
(
from
,
textAlign:
TextAlign
.
center
,
style:
const
TextStyle
(
fontSize:
18
,
fontWeight:
FontWeight
.
w600
),
),
const
SizedBox
(
height:
10
),
Text
(
resultText
,
'toMinus'
.
tr
()
,
textAlign:
TextAlign
.
center
,
style:
TextStyle
(
fontSize:
1
9
*
ratio
),
style:
const
TextStyle
(
fontSize:
1
8
),
),
Text
(
toUsername
??
to
,
textAlign:
TextAlign
.
center
,
style:
const
TextStyle
(
fontSize:
18
,
fontWeight:
FontWeight
.
w600
),
),
const
SizedBox
(
height:
20
),
]),
const
Spacer
(),
Expanded
(
child:
Align
(
alignment:
Alignment
.
bottomCenter
,
child:
SizedBox
(
width:
380
*
ratio
,
height:
60
*
ratio
,
child:
ElevatedButton
(
key:
keyCloseTransactionScreen
,
style:
ElevatedButton
.
styleFrom
(
foregroundColor:
Colors
.
white
,
elevation:
4
,
backgroundColor:
orangeC
,
// foreground
),
onPressed:
()
{
),
// const SizedBox(height: 20, width: double.infinity),
const
Spacer
(),
Column
(
children:
[
Visibility
(
visible:
isLoading
,
child:
const
SizedBox
(
height:
18
,
width:
18
,
child:
CircularProgressIndicator
(
color:
orangeC
,
strokeWidth:
2
,
),
),
),
Visibility
(
visible:
!
isLoading
,
child:
Icon
(
isValid
?
Icons
.
done_all
:
Icons
.
close
,
size:
35
,
color:
isValid
?
Colors
.
greenAccent
:
Colors
.
redAccent
,
),
),
const
SizedBox
(
height:
10
),
Text
(
resultText
,
textAlign:
TextAlign
.
center
,
style:
TextStyle
(
fontSize:
19
*
ratio
),
),
]),
const
Spacer
(),
Expanded
(
child:
Align
(
alignment:
Alignment
.
bottomCenter
,
child:
SizedBox
(
width:
380
*
ratio
,
height:
60
*
ratio
,
child:
ElevatedButton
(
key:
keyCloseTransactionScreen
,
style:
ElevatedButton
.
styleFrom
(
foregroundColor:
Colors
.
white
,
elevation:
4
,
backgroundColor:
orangeC
,
// foreground
),
onPressed:
()
{
Navigator
.
pop
(
context
);
sub
.
transactionStatus
=
''
;
if
(
transType
==
'identityMigration'
)
{
Navigator
.
pop
(
context
);
sub
.
transactionStatus
=
''
;
if
(
transType
==
'identityMigration'
)
{
Navigator
.
pop
(
context
);
}
},
child:
Text
(
'close'
.
tr
(),
style:
TextStyle
(
fontSize:
23
*
ratio
,
fontWeight:
FontWeight
.
w600
),
),
}
},
child:
Text
(
'close'
.
tr
(),
style:
TextStyle
(
fontSize:
23
*
ratio
,
fontWeight:
FontWeight
.
w600
),
),
),
),
),
SizedBox
(
height:
isTall
?
80
:
20
)
])),
),
));
),
SizedBox
(
height:
isTall
?
80
:
20
)
])),
),
),
);
}
}
This diff is collapsed.
Click to expand it.
lib/widgets/bottom_app_bar.dart
+
3
−
11
View file @
5dbec1ac
// ignore_for_file: use_build_context_synchronously
import
'dart:io'
;
import
'package:flutter/material.dart'
;
import
'package:gecko/globals.dart'
;
import
'package:gecko/models/wallet_data.dart'
;
...
...
@@ -10,7 +9,6 @@ import 'package:gecko/providers/my_wallets.dart';
import
'package:gecko/providers/search.dart'
;
import
'package:gecko/providers/wallets_profiles.dart'
;
import
'package:gecko/screens/myWallets/unlocking_wallet.dart'
;
import
'package:gecko/screens/search.dart'
;
import
'package:provider/provider.dart'
;
class
GeckoBottomAppBar
extends
StatelessWidget
{
...
...
@@ -40,23 +38,17 @@ class GeckoBottomAppBar extends StatelessWidget {
const
SizedBox
(
width:
11
),
IconButton
(
key:
keyAppBarSearch
,
iconSize:
40
,
icon:
const
I
mage
(
image:
AssetImage
(
'assets/loupe-noire.png'
)
),
iconSize:
55
,
icon:
const
I
con
(
Icons
.
home_outlined
),
onPressed:
()
{
searchProvider
.
reload
();
Navigator
.
popUntil
(
context
,
ModalRoute
.
withName
(
'/'
),
);
Navigator
.
push
(
context
,
MaterialPageRoute
(
builder:
(
homeContext
)
{
return
const
SearchScreen
();
}),
);
},
),
const
SizedBox
(
width:
2
2
),
const
SizedBox
(
width:
1
2
),
const
Spacer
(),
IconButton
(
key:
keyAppBarQrcode
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment