Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions lib/constants/app_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ class AppTheme {
unselectedWidgetColor: Colors.black45,
focusColor: Colors.black,
textTheme: TextTheme(
headline1: TextStyle(
displayLarge: TextStyle(
color: Colors.black, fontSize: 40, fontWeight: FontWeight.w500),
headline2: TextStyle(
displayMedium: TextStyle(
color: Colors.black, fontSize: 34, fontWeight: FontWeight.w400),
headline3: TextStyle(
displaySmall: TextStyle(
color: Colors.black, fontSize: 22, fontWeight: FontWeight.w500),
headline4: TextStyle(
headlineMedium: TextStyle(
color: Colors.black54, fontSize: 16, fontWeight: FontWeight.bold),
headline5: TextStyle(
headlineSmall: TextStyle(
color: Colors.black, fontSize: 19, fontWeight: FontWeight.w700),
headline6: TextStyle(
titleLarge: TextStyle(
color: Colors.black, fontSize: 13, fontWeight: FontWeight.w400),
subtitle1: TextStyle(
titleMedium: TextStyle(
color: Colors.black87, fontSize: 14, fontWeight: FontWeight.normal),
subtitle2: TextStyle(
titleSmall: TextStyle(
color: Colors.black, fontSize: 16, fontWeight: FontWeight.bold),
),
);
Expand All @@ -48,21 +48,21 @@ class AppTheme {
scaffoldBackgroundColor: Colors.black,
focusColor: Colors.white,
textTheme: TextTheme(
headline1: TextStyle(
displayLarge: TextStyle(
color: Colors.white, fontSize: 40, fontWeight: FontWeight.w500),
headline2: TextStyle(
displayMedium: TextStyle(
color: Colors.white, fontSize: 34, fontWeight: FontWeight.w400),
headline3: TextStyle(
displaySmall: TextStyle(
color: Colors.white, fontSize: 22, fontWeight: FontWeight.w500),
headline4: TextStyle(
headlineMedium: TextStyle(
color: Colors.white70, fontSize: 16, fontWeight: FontWeight.bold),
headline5: TextStyle(
headlineSmall: TextStyle(
color: Colors.white, fontSize: 19, fontWeight: FontWeight.w700),
headline6: TextStyle(
titleLarge: TextStyle(
color: Colors.white, fontSize: 13, fontWeight: FontWeight.w400),
subtitle1: TextStyle(
titleMedium: TextStyle(
color: Colors.white70, fontSize: 14, fontWeight: FontWeight.normal),
subtitle2: TextStyle(
titleSmall: TextStyle(
color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold)),
);
}
4 changes: 2 additions & 2 deletions lib/ui/widgets/details/details_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class DetailsWidget extends HookConsumerWidget {
TabBar(
labelColor: Theme.of(context).focusColor,
unselectedLabelColor: Theme.of(context).unselectedWidgetColor,
unselectedLabelStyle: Theme.of(context).textTheme.headline4,
labelStyle: Theme.of(context).textTheme.headline4,
unselectedLabelStyle: Theme.of(context).textTheme.headlineMedium,
labelStyle: Theme.of(context).textTheme.headlineMedium,
indicatorWeight: 4,
indicatorSize: TabBarIndicatorSize.label,
indicatorColor: Theme.of(context).focusColor,
Expand Down
12 changes: 6 additions & 6 deletions lib/ui/widgets/details/order_book_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ class OrderBookSection extends StatelessWidget {
children: [
Text(
LocaleKeys.bid.tr(),
style: Theme.of(context).textTheme.subtitle2,
style: Theme.of(context).textTheme.titleSmall,
),
Text(
LocaleKeys.ask.tr(),
style: Theme.of(context).textTheme.subtitle2,
style: Theme.of(context).textTheme.titleSmall,
)
],
),
Expand All @@ -46,11 +46,11 @@ class OrderBookSection extends StatelessWidget {
children: [
Text(
data.bids[index].amount.toString(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
Text(
data.bids[index].price.toString(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
)
],
),
Expand All @@ -73,11 +73,11 @@ class OrderBookSection extends StatelessWidget {
children: [
Text(
data.asks[index].amount.toString(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
Text(
data.asks[index].price.toString(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
)
],
),
Expand Down
28 changes: 14 additions & 14 deletions lib/ui/widgets/details/summary_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class SummarySection extends StatelessWidget {
children: [
Text(
LocaleKeys.price.tr(),
style: Theme.of(context).textTheme.subtitle2,
style: Theme.of(context).textTheme.titleSmall,
)
],
),
Expand All @@ -27,11 +27,11 @@ class SummarySection extends StatelessWidget {
children: [
Text(
LocaleKeys.last.tr(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
Text(
data.price.last.toString(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
)
],
),
Expand All @@ -41,11 +41,11 @@ class SummarySection extends StatelessWidget {
children: [
Text(
LocaleKeys.high.tr(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
Text(
data.price.high.toString(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
)
],
),
Expand All @@ -55,11 +55,11 @@ class SummarySection extends StatelessWidget {
children: [
Text(
LocaleKeys.low.tr(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
Text(
data.price.low.toString(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
)
],
),
Expand All @@ -69,11 +69,11 @@ class SummarySection extends StatelessWidget {
children: [
Text(
LocaleKeys.change.tr(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
Text(
data.price.change.absolute.toString(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
)
],
),
Expand All @@ -82,7 +82,7 @@ class SummarySection extends StatelessWidget {
children: [
Text(
LocaleKeys.volume.tr(),
style: Theme.of(context).textTheme.subtitle2,
style: Theme.of(context).textTheme.titleSmall,
)
],
),
Expand All @@ -92,11 +92,11 @@ class SummarySection extends StatelessWidget {
children: [
Text(
LocaleKeys.volume.tr(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
Text(
data.volume.toString(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
)
],
),
Expand All @@ -106,11 +106,11 @@ class SummarySection extends StatelessWidget {
children: [
Text(
LocaleKeys.quoteVolume.tr(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
Text(
data.volumeQuote.toString(),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
)
],
),
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/widgets/details/time_bar_selector.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ class TimeBarSelector extends HookConsumerWidget {
e.name
? Theme.of(context)
.textTheme
.headline3!
.displaySmall!
.apply(color: Colors.white)
: Theme.of(context).textTheme.headline4,
: Theme.of(context).textTheme.headlineMedium,
),
),
),
Expand Down
12 changes: 6 additions & 6 deletions lib/ui/widgets/details/trades_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ class TradesSection extends StatelessWidget {
Expanded(
child: Text(
LocaleKeys.time.tr(),
style: Theme.of(context).textTheme.subtitle2,
style: Theme.of(context).textTheme.titleSmall,
),
),
Expanded(
child: Text(
LocaleKeys.price.tr(),
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.subtitle2,
style: Theme.of(context).textTheme.titleSmall,
),
),
Expanded(
child: Text(
LocaleKeys.amount.tr(),
textAlign: TextAlign.right,
style: Theme.of(context).textTheme.subtitle2,
style: Theme.of(context).textTheme.titleSmall,
),
)
],
Expand All @@ -54,23 +54,23 @@ class TradesSection extends StatelessWidget {
flex: 1,
child: Text(
Utils.epochToString(data[index].timestamp),
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
),
Expanded(
flex: 1,
child: Text(
data[index].price,
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
),
Expanded(
flex: 1,
child: Text(
data[index].amount,
textAlign: TextAlign.right,
style: Theme.of(context).textTheme.subtitle1,
style: Theme.of(context).textTheme.titleMedium,
),
)
],
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/widgets/favorite_pair.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class FavoritePairWidget extends HookWidget {
),
SizedBox(width: 10),
Text(LocaleKeys.openChart.tr(),
style: Theme.of(context).textTheme.headline3),
style: Theme.of(context).textTheme.displaySmall),
],
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/widgets/line_chart.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class LineChartWidget extends StatelessWidget {
else if (error || data.length == 0)
Center(
child: Text(LocaleKeys.noResults.tr(),
style: Theme.of(context).textTheme.headline3),
style: Theme.of(context).textTheme.displaySmall),
)
]);
}
Expand Down
8 changes: 4 additions & 4 deletions lib/ui/widgets/pair_tile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class PairTile extends HookConsumerWidget {
minFontSize: 0,
stepGranularity: 0.1,
maxLines: 1,
style: Theme.of(context).textTheme.headline5),
style: Theme.of(context).textTheme.headlineSmall),
),
),
Expanded(
Expand Down Expand Up @@ -80,7 +80,7 @@ class PairTile extends HookConsumerWidget {
AutoSizeText(
summary.price.last.toStringAsFixed(2),
minFontSize: 10,
style: Theme.of(context).textTheme.headline5,
style: Theme.of(context).textTheme.headlineSmall,
),
SizedBox(
height: 5,
Expand All @@ -98,7 +98,7 @@ class PairTile extends HookConsumerWidget {
maxLines: 1,
style: Theme.of(context)
.textTheme
.headline5!
.headlineSmall!
.apply(
color: summary.price.change
.absolute >=
Expand All @@ -114,7 +114,7 @@ class PairTile extends HookConsumerWidget {
maxLines: 1,
style: Theme.of(context)
.textTheme
.headline6),
.titleLarge),
]),
],
),
Expand Down
8 changes: 4 additions & 4 deletions lib/ui/widgets/title_price.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ class TitlePrice extends HookConsumerWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AutoSizeText(pair.pair,
maxLines: 1, style: Theme.of(context).textTheme.headline2),
maxLines: 1, style: Theme.of(context).textTheme.displayMedium),
AutoSizeText(data.price.last.toString(),
maxLines: 1, style: Theme.of(context).textTheme.headline1),
maxLines: 1, style: Theme.of(context).textTheme.displayLarge),
if (true)
Row(children: [
AutoSizeText(data.price.change.absolute.toStringAsFixed(5),
Expand All @@ -36,15 +36,15 @@ class TitlePrice extends HookConsumerWidget {
? Colors.green
: Colors.red,
fontSize:
Theme.of(context).textTheme.headline5?.fontSize,
Theme.of(context).textTheme.headlineSmall?.fontSize,
fontWeight: FontWeight.w800)),
AutoSizeText(
' (${data.price.change.percentage.toStringAsFixed(2)}%)',
textAlign: TextAlign.start,
minFontSize: 0,
stepGranularity: 0.1,
maxLines: 1,
style: Theme.of(context).textTheme.headline4),
style: Theme.of(context).textTheme.headlineMedium),
]),
],
),
Expand Down