new icon without white border

This commit is contained in:
ryleedavis 2022-10-11 10:34:36 -06:00
parent ec4097e274
commit 8742496a24
4 changed files with 131 additions and 128 deletions

View file

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View file

@ -3,7 +3,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/hive/db.dart'; import 'package:stackwallet/hive/db.dart';
import 'package:stackwallet/pages/pinpad_views/create_pin_view.dart'; import 'package:stackwallet/pages/pinpad_views/create_pin_view.dart';
import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/providers/global/prefs_provider.dart'; import 'package:stackwallet/providers/global/prefs_provider.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
@ -13,10 +12,6 @@ import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart';
import 'package:stackwallet/hive/db.dart';
import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/util.dart';
class StackPrivacyCalls extends ConsumerStatefulWidget { class StackPrivacyCalls extends ConsumerStatefulWidget {
const StackPrivacyCalls({ const StackPrivacyCalls({
Key? key, Key? key,
@ -82,18 +77,24 @@ class _StackPrivacyCalls extends ConsumerState<StackPrivacyCalls> {
const SizedBox( const SizedBox(
height: 36, height: 36,
), ),
Center( const Padding(
child: CustomRadio((bool isEasy) { padding: EdgeInsets.symmetric(
setState(() { horizontal: 16,
this.isEasy = isEasy; ),
child: PrivacyToggle(),
DB.instance.put<dynamic>(
boxName: DB.boxNamePrefs,
key: "externalCalls",
value: isEasy);
});
}),
), ),
// Center(
// child: CustomRadio((bool isEasy) {
// setState(() {
// this.isEasy = isEasy;
//
// DB.instance.put<dynamic>(
// boxName: DB.boxNamePrefs,
// key: "externalCalls",
// value: isEasy);
// });
// }),
// ),
const SizedBox( const SizedBox(
height: 36, height: 36,
), ),
@ -148,6 +149,8 @@ class _StackPrivacyCalls extends ConsumerState<StackPrivacyCalls> {
Expanded( Expanded(
child: ContinueButton( child: ContinueButton(
isDesktop: isDesktop, isDesktop: isDesktop,
isSettings: widget.isSettings,
isEasy: isEasy,
), ),
), ),
], ],
@ -380,113 +383,113 @@ class ContinueButton extends StatelessWidget {
} }
} }
class CustomRadio extends StatefulWidget { // class CustomRadio extends StatefulWidget {
CustomRadio(this.upperCall, {Key? key}) : super(key: key); // CustomRadio(this.upperCall, {Key? key}) : super(key: key);
//
Function upperCall; // Function upperCall;
//
@override // @override
createState() { // createState() {
return CustomRadioState(); // return CustomRadioState();
} // }
} // }
//
class CustomRadioState extends State<CustomRadio> { // class CustomRadioState extends State<CustomRadio> {
List<RadioModel> sampleData = <RadioModel>[]; // List<RadioModel> sampleData = <RadioModel>[];
//
@override // @override
void initState() { // void initState() {
super.initState(); // super.initState();
sampleData.add( // sampleData.add(
RadioModel(true, Assets.svg.personaEasy, 'Easy Crypto', 'Recommended')); // RadioModel(true, Assets.svg.personaEasy, 'Easy Crypto', 'Recommended'));
sampleData.add(RadioModel( // sampleData.add(RadioModel(
false, Assets.svg.personaIncognito, 'Incognito', 'Privacy conscious')); // false, Assets.svg.personaIncognito, 'Incognito', 'Privacy conscious'));
} // }
//
@override // @override
Widget build(BuildContext context) { // Widget build(BuildContext context) {
return Row( // return Row(
mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
children: [ // children: [
InkWell( // InkWell(
onTap: () { // onTap: () {
setState(() { // setState(() {
// if (!sampleData[0].isSelected) { // // if (!sampleData[0].isSelected) {
widget.upperCall.call(true); // widget.upperCall.call(true);
// } // // }
for (var element in sampleData) { // for (var element in sampleData) {
element.isSelected = false; // element.isSelected = false;
} // }
sampleData[0].isSelected = true; // sampleData[0].isSelected = true;
}); // });
}, // },
child: RadioItem(sampleData[0]), // child: RadioItem(sampleData[0]),
), // ),
InkWell( // InkWell(
onTap: () { // onTap: () {
setState(() { // setState(() {
// if (!sampleData[1].isSelected) { // // if (!sampleData[1].isSelected) {
widget.upperCall.call(false); // widget.upperCall.call(false);
// } // // }
for (var element in sampleData) { // for (var element in sampleData) {
element.isSelected = false; // element.isSelected = false;
} // }
sampleData[1].isSelected = true; // sampleData[1].isSelected = true;
}); // });
}, // },
child: RadioItem(sampleData[1]), // child: RadioItem(sampleData[1]),
) // )
], // ],
); // );
} // }
} // }
//
class RadioItem extends StatelessWidget { // class RadioItem extends StatelessWidget {
final RadioModel _item; // final RadioModel _item;
const RadioItem(this._item, {Key? key}) : super(key: key); // const RadioItem(this._item, {Key? key}) : super(key: key);
@override // @override
Widget build(BuildContext context) { // Widget build(BuildContext context) {
return Container( // return Container(
margin: const EdgeInsets.all(15.0), // margin: const EdgeInsets.all(15.0),
child: RoundedWhiteContainer( // child: RoundedWhiteContainer(
borderColor: _item.isSelected ? const Color(0xFF0056D2) : null, // borderColor: _item.isSelected ? const Color(0xFF0056D2) : null,
child: Center( // child: Center(
child: Column( // child: Column(
children: [ // children: [
SvgPicture.asset( // SvgPicture.asset(
_item.svg, // _item.svg,
// color: Theme.of(context).extension<StackColors>()!.textWhite, // // color: Theme.of(context).extension<StackColors>()!.textWhite,
width: 140, // width: 140,
height: 140, // height: 140,
), // ),
RichText( // RichText(
textAlign: TextAlign.center, // textAlign: TextAlign.center,
text: TextSpan( // text: TextSpan(
style: STextStyles.label(context).copyWith(fontSize: 12.0), // style: STextStyles.label(context).copyWith(fontSize: 12.0),
children: [ // children: [
TextSpan( // TextSpan(
text: _item.topText, // text: _item.topText,
style: TextStyle( // style: TextStyle(
color: Theme.of(context) // color: Theme.of(context)
.extension<StackColors>()! // .extension<StackColors>()!
.textDark, // .textDark,
fontWeight: FontWeight.bold)), // fontWeight: FontWeight.bold)),
TextSpan(text: "\n${_item.bottomText}"), // TextSpan(text: "\n${_item.bottomText}"),
], // ],
), // ),
), // ),
], // ],
)), // )),
), // ),
); // );
} // }
} // }
//
class RadioModel { // class RadioModel {
bool isSelected; // bool isSelected;
final String svg; // final String svg;
final String topText; // final String topText;
final String bottomText; // final String bottomText;
//
RadioModel(this.isSelected, this.svg, this.topText, this.bottomText); // RadioModel(this.isSelected, this.svg, this.topText, this.bottomText);
} // }

View file

@ -53,7 +53,7 @@ class _SVG {
String get polygon => "assets/svg/Polygon.svg"; String get polygon => "assets/svg/Polygon.svg";
String get personaIncognito => "assets/svg/persona-incognito-1.svg"; String get personaIncognito => "assets/svg/persona-incognito-1.svg";
String get personaEasy => "assets/svg/persona-easy-1.svg"; String get personaEasy => "assets/svg/persona-easy.svg";
String get drd => "assets/svg/drd-icon.svg"; String get drd => "assets/svg/drd-icon.svg";
String get boxAuto => "assets/svg/box-auto.svg"; String get boxAuto => "assets/svg/box-auto.svg";
String get plus => "assets/svg/plus.svg"; String get plus => "assets/svg/plus.svg";

View file

@ -290,7 +290,7 @@ flutter:
- assets/svg/tx-icon-anonymize-pending.svg - assets/svg/tx-icon-anonymize-pending.svg
- assets/svg/tx-icon-anonymize-failed.svg - assets/svg/tx-icon-anonymize-failed.svg
- assets/svg/Polygon.svg - assets/svg/Polygon.svg
- assets/svg/persona-easy-1.svg - assets/svg/persona-easy.svg
- assets/svg/persona-incognito-1.svg - assets/svg/persona-incognito-1.svg
# coin icons # coin icons
- assets/svg/coin_icons/Bitcoin.svg - assets/svg/coin_icons/Bitcoin.svg