fruit and ocean easy/incognito pngs + ocean stack img

This commit is contained in:
ryleedavis 2023-02-14 11:32:32 -07:00
parent 057a233604
commit c37ec4fb81
8 changed files with 86 additions and 35 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 677 KiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 312 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 255 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 862 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

View file

@ -10,6 +10,7 @@ import 'package:stackwallet/services/exchange/exchange_data_loading_service.dart
import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/color_theme.dart';
import 'package:stackwallet/utilities/theme/stack_colors.dart';
import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/desktop/desktop_dialog.dart';
@ -18,6 +19,8 @@ import 'package:stackwallet/widgets/desktop/primary_button.dart';
import 'package:stackwallet/widgets/desktop/secondary_button.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart';
import '../../../../providers/ui/color_theme_provider.dart';
class StackPrivacyDialog extends ConsumerStatefulWidget {
const StackPrivacyDialog({Key? key}) : super(key: key);
@ -149,7 +152,9 @@ class _StackPrivacyDialog extends ConsumerState<StackPrivacyDialog> {
Expanded(
child: SecondaryButton(
label: "Cancel",
onPressed: () {},
onPressed: () {
Navigator.of(context).pop();
},
),
),
const SizedBox(
@ -192,7 +197,7 @@ class _StackPrivacyDialog extends ConsumerState<StackPrivacyDialog> {
}
}
class PrivacyToggle extends StatefulWidget {
class PrivacyToggle extends ConsumerStatefulWidget {
const PrivacyToggle({
Key? key,
required this.externalCallsEnabled,
@ -203,17 +208,23 @@ class PrivacyToggle extends StatefulWidget {
final void Function(bool)? onChanged;
@override
State<PrivacyToggle> createState() => _PrivacyToggleState();
ConsumerState<PrivacyToggle> createState() => _PrivacyToggleState();
}
class _PrivacyToggleState extends State<PrivacyToggle> {
class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
late bool externalCallsEnabled;
late final bool isDesktop;
late final bool isSorbet;
late final bool isOcean;
@override
void initState() {
isDesktop = Util.isDesktop;
isSorbet = ref.read(colorThemeProvider.state).state.themeType ==
ThemeType.fruitSorbet;
isOcean = ref.read(colorThemeProvider.state).state.themeType ==
ThemeType.oceanBreeze;
// initial toggle state
externalCallsEnabled = widget.externalCallsEnabled;
super.initState();
@ -258,19 +269,31 @@ class _PrivacyToggleState extends State<PrivacyToggle> {
Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
if (isDesktop)
const SizedBox(
height: 10,
),
SvgPicture.asset(
Assets.svg.personaEasy(context),
width: 120,
height: 120,
),
if (isDesktop)
const SizedBox(
height: 12,
),
// if (isDesktop)
// const SizedBox(
// height: 10,
// ),
// if (isDesktop)
// const SizedBox(
// height: 12,
// ),
(isSorbet || isOcean)
? Image.asset(
Assets.png.personaEasy(context),
width: 120,
height: 120,
)
: SvgPicture.asset(
Assets.svg.personaEasy(context),
width: 120,
height: 120,
),
// if (!isSorbet || !isOcean)
// SvgPicture.asset(
// Assets.svg.personaEasy(context),
// width: 120,
// height: 120,
// ),
Center(
child: Text(
"Easy Crypto",
@ -368,11 +391,17 @@ class _PrivacyToggleState extends State<PrivacyToggle> {
const SizedBox(
height: 10,
),
SvgPicture.asset(
Assets.svg.personaIncognito(context),
width: 120,
height: 120,
),
(isSorbet || isOcean)
? Image.asset(
Assets.png.personaIncognito(context),
width: 120,
height: 120,
)
: SvgPicture.asset(
Assets.svg.personaIncognito(context),
width: 120,
height: 120,
),
if (isDesktop)
const SizedBox(
height: 12,

View file

@ -296,6 +296,11 @@ class _PNG {
String particl(BuildContext context) =>
"assets/images/${Theme.of(context).extension<StackColors>()!.themeType.name}/particl.png";
String personaIncognito(BuildContext context) =>
"assets/svg/${Theme.of(context).extension<StackColors>()!.themeType.name}/persona-incognito-1.png";
String personaEasy(BuildContext context) =>
"assets/svg/${Theme.of(context).extension<StackColors>()!.themeType.name}/persona-easy-1.png";
String get glasses => "assets/images/glasses.png";
String get glassesHidden => "assets/images/glasses-hidden.png";

View file

@ -339,6 +339,19 @@ flutter:
- assets/images/oledBlack/namecoin.png
- assets/images/oledBlack/particl.png
# ocean breeze theme coin
- assets/images/oceanBreeze/stack.png
- assets/images/oceanBreeze/monero.png
- assets/images/oceanBreeze/wownero.png
- assets/images/oceanBreeze/firo.png
- assets/images/oceanBreeze/litecoin.png
- assets/images/oceanBreeze/doge.png
- assets/images/oceanBreeze/bitcoin.png
- assets/images/oceanBreeze/epic-cash.png
- assets/images/oceanBreeze/bitcoincash.png
- assets/images/oceanBreeze/namecoin.png
- assets/images/oceanBreeze/particl.png
# fruit sorbet theme coin
- assets/images/fruitSorbet/stack.png
- assets/images/fruitSorbet/monero.png
@ -421,8 +434,8 @@ flutter:
- assets/svg/light/bell-new.svg
- assets/svg/light/stack-icon1.svg
- assets/svg/light/buy-coins-icon.svg
- assets/svg/persona-easy-1.svg
- assets/svg/persona-incognito-1.svg
- assets/svg/light/persona-easy-1.svg
- assets/svg/light/persona-incognito-1.svg
# dark theme specific
- assets/svg/dark/tx-exchange-icon.svg
@ -438,8 +451,8 @@ flutter:
- assets/svg/dark/bell-new.svg
- assets/svg/dark/stack-icon1.svg
- assets/svg/dark/buy-coins-icon.svg
- assets/svg/persona-easy-1.svg
- assets/svg/persona-incognito-1.svg
- assets/svg/dark/persona-easy-1.svg
- assets/svg/dark/persona-incognito-1.svg
# ocean theme specific
- assets/svg/oceanBreeze/tx-exchange-icon.svg
@ -456,8 +469,10 @@ flutter:
- assets/svg/oceanBreeze/stack-icon1.svg
- assets/svg/oceanBreeze/buy-coins-icon.svg
- assets/svg/oceanBreeze/bg.svg
- assets/svg/persona-easy-1.svg
- assets/svg/persona-incognito-1.svg
- assets/svg/oceanBreeze/persona-easy-1.svg
- assets/svg/oceanBreeze/persona-incognito-1.svg
- assets/svg/oceanBreeze/persona-easy-1.png
- assets/svg/oceanBreeze/persona-incognito-1.png
# OLED black theme specific
- assets/svg/oledBlack/tx-exchange-icon.svg
@ -472,9 +487,9 @@ flutter:
- assets/svg/oledBlack/exchange-2.svg
- assets/svg/oledBlack/bell-new.svg
- assets/svg/oledBlack/stack-icon1.svg
- assets/svg/oledBlack/buy-coins-icon.svg
- assets/svg/persona-easy-1.svg
- assets/svg/persona-incognito-1.svg
- assets/svg/oceanBreeze/buy-coins-icon.svg
- assets/svg/oceanBreeze/persona-easy-1.svg
- assets/svg/oceanBreeze/persona-incognito-1.svg
# fruit sorbet theme specific
- assets/svg/fruitSorbet/tx-exchange-icon.svg
@ -491,8 +506,10 @@ flutter:
- assets/svg/fruitSorbet/stack-icon1.svg
- assets/svg/fruitSorbet/buy-coins-icon.svg
- assets/svg/fruitSorbet/bg.svg
- assets/svg/persona-easy-1.svg
- assets/svg/persona-incognito-1.svg
- assets/svg/fruitSorbet/persona-easy-1.svg
- assets/svg/fruitSorbet/persona-incognito-1.svg
- assets/svg/fruitSorbet/persona-easy-1.png
- assets/svg/fruitSorbet/persona-incognito-1.png
# forest theme specific
- assets/svg/forest/tx-exchange-icon.svg
@ -509,8 +526,8 @@ flutter:
- assets/svg/forest/stack-icon1.svg
- assets/svg/forest/buy-coins-icon.svg
- assets/svg/forest/bg.svg
- assets/svg/persona-easy-1.svg
- assets/svg/persona-incognito-1.svg
- assets/svg/forest/persona-easy-1.svg
- assets/svg/forest/persona-incognito-1.svg
# buy
- assets/svg/buy/Simplex-Nuvei-Logo.svg