Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-11-16 17:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/ui-fixes' into add-ethereum

Browse source
This commit is contained in:
julian 2023-02-27 15:34:16 -06:00
commit 73ae19dfbe
7 changed files with 400 additions and 392 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

497
assets/images/oceanBreeze/stack.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 1.9 MiB

124
assets/svg/oceanBreeze/persona-easy-1.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 1.9 MiB

120
assets/svg/oceanBreeze/persona-incognito-1.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 3.6 MiB

18
lib/pages/stack_privacy_calls.dart
View file

@ -357,7 +357,7 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
// const SizedBox(
// height: 10,
// ),
(isSorbet || isOcean)
(isSorbet)
? Image.asset(
Assets.png.personaEasy(context),
width: 140,
@ -468,11 +468,17 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
const SizedBox(
height: 10,
),
SvgPicture.asset(
Assets.svg.personaIncognito(context),
width: isDesktop ? 120 : 140,
height: isDesktop ? 120 : 140,
),
(isSorbet)
? Image.asset(
Assets.png.personaIncognito(context),
width: 140,
height: 140,
)
: SvgPicture.asset(
Assets.svg.personaIncognito(context),
width: 140,
height: 140,
),
if (isDesktop)
const SizedBox(
height: 12,

27
lib/pages/wallets_view/sub_widgets/empty_wallets.dart
View file

@ -21,6 +21,8 @@ class EmptyWallets extends ConsumerWidget {
ThemeType.fruitSorbet;
final bool isForest =
ref.read(colorThemeProvider.state).state.themeType == ThemeType.forest;
final bool isOcean = ref.read(colorThemeProvider.state).state.themeType ==
ThemeType.oceanBreeze;
return SafeArea(
child: Padding(
@ -100,13 +102,15 @@ class EmptyWallets extends ConsumerWidget {
}
}
class AddWalletButton extends StatelessWidget {
class AddWalletButton extends ConsumerWidget {
const AddWalletButton({Key? key, required this.isDesktop}) : super(key: key);
final bool isDesktop;
@override
Widget build(BuildContext context) {
Widget build(BuildContext context, WidgetRef ref) {
final bool isOLED = ref.read(colorThemeProvider.state).state.themeType ==
ThemeType.oledBlack;
return TextButton(
style: Theme.of(context)
.extension<StackColors>()!
@ -129,11 +133,20 @@ class AddWalletButton extends StatelessWidget {
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
Assets.svg.plus,
width: isDesktop ? 18 : null,
height: isDesktop ? 18 : null,
),
isOLED
? SvgPicture.asset(
Assets.svg.plus,
color: Theme.of(context)
.extension<StackColors>()!
.buttonTextPrimary,
width: isDesktop ? 18 : null,
height: isDesktop ? 18 : null,
)
: SvgPicture.asset(
Assets.svg.plus,
width: isDesktop ? 18 : null,
height: isDesktop ? 18 : null,
),
SizedBox(
width: isDesktop ? 8 : 5,
),

4
lib/pages_desktop_specific/settings/settings_menu/advanced_settings/stack_privacy_dialog.dart
View file

@ -273,7 +273,7 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
const SizedBox(
height: 10,
),
(isSorbet || isOcean)
(isSorbet)
? Image.asset(
Assets.png.personaEasy(context),
width: 120,
@ -385,7 +385,7 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
const SizedBox(
height: 10,
),
(isSorbet || isOcean)
(isSorbet)
? Image.asset(
Assets.png.personaIncognito(context),
width: 120,

2
lib/utilities/theme/oled_black_colors.dart
View file

@ -198,7 +198,7 @@ class OledBlackColors extends StackColorTheme {
// text field
@override
Color get textFieldActiveBG => const Color(0xFF232323);
Color get textFieldActiveBG => const Color(0xFF3C3C3C);
@override
Color get textFieldDefaultBG => const Color(0xFF171717);
@override