adding fruit sorbet theme type and selector svg

This commit is contained in:
ryleedavis 2023-01-23 10:58:06 -07:00
parent 69262cefd2
commit edec5f0c2a
7 changed files with 394 additions and 18 deletions

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 76 KiB

View file

@ -1,16 +0,0 @@
<svg width="180" height="152" viewBox="0 0 180 152" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="180" height="20" rx="2" fill="#77A7F9"/>
<rect x="6" y="6" width="106" height="8" rx="1" fill="black"/>
<rect y="30" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="6" y="36" width="106" height="8" rx="1" fill="black"/>
<rect y="52" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="6" y="58" width="106" height="8" rx="1" fill="black"/>
<rect y="74" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="6" y="80" width="106" height="8" rx="1" fill="black"/>
<rect y="96" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="6" y="102" width="106" height="8" rx="1" fill="black"/>
<rect y="118" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="6" y="124" width="106" height="8" rx="1" fill="black"/>
<rect y="140" width="180" height="20" rx="2" fill="#212F46"/>
<rect x="6" y="146" width="106" height="8" rx="1" fill="black"/>
</svg>

Before

Width:  |  Height:  |  Size: 979 B

View file

@ -71,6 +71,7 @@ class _SVG {
String txExchangeFailed(BuildContext context) =>
"assets/svg/${Theme.of(context).extension<StackColors>()!.themeType.name}/tx-exchange-icon-failed.svg";
String get themeFruit => "assets/svg/fruit-sorbet-theme.svg";
String get themeOledBlack => "assets/svg/oled-black-theme.svg";
String get themeOcean => "assets/svg/ocean-breeze-theme.svg";
String get themeLight => "assets/svg/light-mode.svg";

View file

@ -33,6 +33,12 @@ class STextStyles {
fontWeight: FontWeight.w600,
fontSize: 20,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w600,
fontSize: 20,
);
}
}
@ -62,6 +68,12 @@ class STextStyles {
fontWeight: FontWeight.w600,
fontSize: 18,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w600,
fontSize: 18,
);
}
}
@ -91,6 +103,12 @@ class STextStyles {
fontWeight: FontWeight.w600,
fontSize: 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w600,
fontSize: 16,
);
}
}
@ -120,6 +138,12 @@ class STextStyles {
fontWeight: FontWeight.w600,
fontSize: 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w600,
fontSize: 16,
);
}
}
@ -149,6 +173,12 @@ class STextStyles {
fontWeight: FontWeight.w400,
fontSize: 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w400,
fontSize: 16,
);
}
}
@ -178,6 +208,12 @@ class STextStyles {
fontWeight: FontWeight.w400,
fontSize: 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w400,
fontSize: 16,
);
}
}
@ -207,6 +243,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w500,
fontSize: 16,
);
}
}
@ -236,6 +278,12 @@ class STextStyles {
fontWeight: FontWeight.w600,
fontSize: 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w600,
fontSize: 16,
);
}
}
@ -265,6 +313,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).buttonTextPrimary,
fontWeight: FontWeight.w500,
fontSize: 16,
);
}
}
@ -294,6 +348,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w500,
fontSize: 16,
);
}
}
@ -323,6 +383,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark3,
fontWeight: FontWeight.w500,
fontSize: 16,
);
}
}
@ -352,6 +418,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 14,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark3,
fontWeight: FontWeight.w500,
fontSize: 14,
);
}
}
@ -381,6 +453,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 12,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textSubtitle1,
fontWeight: FontWeight.w500,
fontSize: 12,
);
}
}
@ -414,6 +492,13 @@ class STextStyles {
fontSize: 14,
height: 14 / 14,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textFieldActiveSearchIconRight,
fontWeight: FontWeight.w500,
fontSize: 14,
height: 14 / 14,
);
}
}
@ -443,6 +528,12 @@ class STextStyles {
fontWeight: FontWeight.w700,
fontSize: 12,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textSubtitle1,
fontWeight: FontWeight.w700,
fontSize: 12,
);
}
}
@ -472,6 +563,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 14,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).infoItemLabel,
fontWeight: FontWeight.w500,
fontSize: 14,
);
}
}
@ -501,6 +598,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 14,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w500,
fontSize: 14,
);
}
}
@ -530,6 +633,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 14,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w500,
fontSize: 14,
);
}
}
@ -563,6 +672,13 @@ class STextStyles {
fontSize: 14,
height: 1.5,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textSubtitle2,
fontWeight: FontWeight.w500,
fontSize: 14,
height: 1.5,
);
}
}
@ -596,6 +712,13 @@ class STextStyles {
fontSize: 14,
height: 1.5,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w500,
fontSize: 14,
height: 1.5,
);
}
}
@ -625,6 +748,12 @@ class STextStyles {
fontWeight: FontWeight.w400,
fontSize: 14,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w400,
fontSize: 14,
);
}
}
@ -654,6 +783,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 14,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).accentColorRed,
fontWeight: FontWeight.w500,
fontSize: 14,
);
}
}
@ -683,6 +818,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 14,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).infoItemIcons,
fontWeight: FontWeight.w500,
fontSize: 14,
);
}
}
@ -712,6 +853,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 12,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).accentColorBlue,
fontWeight: FontWeight.w500,
fontSize: 12,
);
}
}
@ -741,6 +888,12 @@ class STextStyles {
fontWeight: FontWeight.w600,
fontSize: 12,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w600,
fontSize: 12,
);
}
}
@ -770,6 +923,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 12,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w500,
fontSize: 12,
);
}
}
@ -799,6 +958,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 12,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w500,
fontSize: 12,
);
}
}
@ -828,6 +993,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 10,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textError,
fontWeight: FontWeight.w500,
fontSize: 10,
);
}
}
@ -857,6 +1028,12 @@ class STextStyles {
fontWeight: FontWeight.w500,
fontSize: 10,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textSubtitle1,
fontWeight: FontWeight.w500,
fontSize: 10,
);
}
}
@ -892,6 +1069,13 @@ class STextStyles {
fontSize: 40,
height: 40 / 40,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w600,
fontSize: 40,
height: 40 / 40,
);
}
}
@ -925,6 +1109,13 @@ class STextStyles {
fontSize: 32,
height: 32 / 32,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w600,
fontSize: 32,
height: 32 / 32,
);
}
}
@ -958,6 +1149,13 @@ class STextStyles {
fontSize: 24,
height: 24 / 24,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w600,
fontSize: 24,
height: 24 / 24,
);
}
}
@ -991,6 +1189,13 @@ class STextStyles {
fontSize: 20,
height: 30 / 20,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w500,
fontSize: 20,
height: 30 / 20,
);
}
}
@ -1024,6 +1229,13 @@ class STextStyles {
fontSize: 20,
height: 30 / 20,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w400,
fontSize: 20,
height: 30 / 20,
);
}
}
@ -1057,6 +1269,13 @@ class STextStyles {
fontSize: 20,
height: 28 / 20,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w400,
fontSize: 20,
height: 28 / 20,
);
}
}
@ -1090,6 +1309,13 @@ class STextStyles {
fontSize: 24,
height: 33 / 24,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w400,
fontSize: 24,
height: 33 / 24,
);
}
}
@ -1123,6 +1349,13 @@ class STextStyles {
fontSize: 20,
height: 26 / 20,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).buttonTextPrimary,
fontWeight: FontWeight.w500,
fontSize: 20,
height: 26 / 20,
);
}
}
@ -1156,6 +1389,13 @@ class STextStyles {
fontSize: 20,
height: 26 / 20,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).buttonTextPrimaryDisabled,
fontWeight: FontWeight.w500,
fontSize: 20,
height: 26 / 20,
);
}
}
@ -1189,6 +1429,13 @@ class STextStyles {
fontSize: 20,
height: 26 / 20,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).buttonTextSecondary,
fontWeight: FontWeight.w500,
fontSize: 20,
height: 26 / 20,
);
}
}
@ -1222,6 +1469,13 @@ class STextStyles {
fontSize: 20,
height: 26 / 20,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).buttonTextSecondaryDisabled,
fontWeight: FontWeight.w500,
fontSize: 20,
height: 26 / 20,
);
}
}
@ -1255,6 +1509,13 @@ class STextStyles {
fontSize: 18,
height: 27 / 18,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w500,
fontSize: 18,
height: 27 / 18,
);
}
}
@ -1288,6 +1549,13 @@ class STextStyles {
fontSize: 18,
height: 27 / 18,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w700,
fontSize: 18,
height: 27 / 18,
);
}
}
@ -1321,6 +1589,13 @@ class STextStyles {
fontSize: 16,
height: 24 / 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).buttonTextPrimaryDisabled,
fontWeight: FontWeight.w500,
fontSize: 16,
height: 24 / 16,
);
}
}
@ -1354,6 +1629,13 @@ class STextStyles {
fontSize: 14,
height: 21 / 14,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textSubtitle1,
fontWeight: FontWeight.w500,
fontSize: 14,
height: 21 / 14,
);
}
}
@ -1387,6 +1669,13 @@ class STextStyles {
fontSize: 14,
height: 21 / 14,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w600,
fontSize: 14,
height: 21 / 14,
);
}
}
@ -1420,6 +1709,13 @@ class STextStyles {
fontSize: 16,
height: 24 / 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).buttonTextSecondary,
fontWeight: FontWeight.w500,
fontSize: 16,
height: 24 / 16,
);
}
}
@ -1453,6 +1749,13 @@ class STextStyles {
fontSize: 20,
height: 30 / 20,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textSubtitle2,
fontWeight: FontWeight.w500,
fontSize: 20,
height: 30 / 20,
);
}
}
@ -1486,6 +1789,13 @@ class STextStyles {
fontSize: 16,
height: 20.8 / 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark.withOpacity(0.8),
fontWeight: FontWeight.w500,
fontSize: 16,
height: 20.8 / 16,
);
}
}
@ -1519,6 +1829,13 @@ class STextStyles {
fontSize: 16,
height: 20.8 / 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w500,
fontSize: 16,
height: 20.8 / 16,
);
}
}
@ -1552,6 +1869,13 @@ class STextStyles {
fontSize: 16,
height: 20.8 / 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark.withOpacity(0.5),
fontWeight: FontWeight.w500,
fontSize: 16,
height: 20.8 / 16,
);
}
}
@ -1585,6 +1909,13 @@ class STextStyles {
fontSize: 16,
height: 20.8 / 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
color: _theme(context).textDark,
fontWeight: FontWeight.w500,
fontSize: 16,
height: 20.8 / 16,
);
}
}
@ -1614,6 +1945,12 @@ class STextStyles {
fontWeight: FontWeight.w600,
fontSize: 8,
);
case ThemeType.fruitSorbet:
return GoogleFonts.roboto(
color: _theme(context).textDark,
fontWeight: FontWeight.w600,
fontSize: 8,
);
}
}
@ -1643,6 +1980,12 @@ class STextStyles {
fontWeight: FontWeight.w400,
fontSize: 26,
);
case ThemeType.fruitSorbet:
return GoogleFonts.roboto(
color: _theme(context).numberTextDefault,
fontWeight: FontWeight.w400,
fontSize: 26,
);
}
}
@ -1676,6 +2019,13 @@ class STextStyles {
fontWeight: FontWeight.w400,
fontSize: 12,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
letterSpacing: 0.5,
color: _theme(context).accentColorDark,
fontWeight: FontWeight.w400,
fontSize: 12,
);
}
}
@ -1709,6 +2059,13 @@ class STextStyles {
fontWeight: FontWeight.w600,
fontSize: 16,
);
case ThemeType.fruitSorbet:
return GoogleFonts.inter(
letterSpacing: 0.5,
color: _theme(context).accentColorDark,
fontWeight: FontWeight.w600,
fontSize: 16,
);
}
}
}

View file

@ -1,11 +1,12 @@
import 'package:flutter/material.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/theme/dark_colors.dart';
import 'package:stackwallet/utilities/theme/fruit_sorbet_theme.dart';
import 'package:stackwallet/utilities/theme/light_colors.dart';
import 'package:stackwallet/utilities/theme/ocean_breeze_colors.dart';
import 'package:stackwallet/utilities/theme/oled_black_colors.dart';
enum ThemeType { light, dark, oceanBreeze, oledBlack }
enum ThemeType { light, dark, oceanBreeze, oledBlack, fruitSorbet }
// adjust this file
@ -20,6 +21,8 @@ extension ThemeTypeExt on ThemeType {
return OceanBreezeColors();
case ThemeType.oledBlack:
return OledBlackColors();
case ThemeType.fruitSorbet:
return FruitSorbetColors();
}
}
@ -33,6 +36,8 @@ extension ThemeTypeExt on ThemeType {
return "Ocean Breeze";
case ThemeType.oledBlack:
return "Oled Black";
case ThemeType.fruitSorbet:
return "Fruit Sorbet";
}
}
}

View file

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:stackwallet/utilities/theme/color_theme.dart';
class LightColors extends StackColorTheme {
class FruitSorbetColors extends StackColorTheme {
@override
ThemeType get themeType => ThemeType.light;

View file

@ -338,6 +338,7 @@ flutter:
- assets/svg/light-mode.svg
- assets/svg/ocean-breeze-theme.svg
- assets/svg/oled-black-theme.svg
- assets/svg/fruit-sorbet-theme.svg
# light theme specific
- assets/svg/light/tx-exchange-icon.svg