[Presentation] Updated the elements chart

Wolfteam · May 27, 2022 · a265317 · a265317
1 parent 05119f9
commit a265317
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 29 deletions.
diff --git a/lib/injection.dart b/lib/injection.dart
@@ -183,10 +183,10 @@ class Injection {
     return ChartAscensionStatsBloc(genshinService);
   }
 
-  static BirthdaysPerMonthBloc get birthdaysPerMonthBloc {
+  static CharactersBirthdaysPerMonthBloc get charactersBirthdaysPerMonthBloc {
     final genshinService = getIt<GenshinService>();
     final telemetryService = getIt<TelemetryService>();
-    return BirthdaysPerMonthBloc(genshinService, telemetryService);
+    return CharactersBirthdaysPerMonthBloc(genshinService, telemetryService);
   }
 
   static ItemsAscensionStatsBloc get itemsAscensionStatsBloc {

diff --git a/lib/presentation/banner_history/widgets/version_details_dialog.dart b/lib/presentation/banner_history/widgets/version_details_dialog.dart
@@ -11,6 +11,7 @@ import 'package:shiori/presentation/shared/extensions/rarity_extensions.dart';
 import 'package:shiori/presentation/shared/images/circle_character.dart';
 import 'package:shiori/presentation/shared/images/circle_weapon.dart';
 import 'package:shiori/presentation/shared/loading.dart';
+import 'package:shiori/presentation/shared/nothing_found_column.dart';
 
 class VersionDetailsDialog extends StatelessWidget {
   final double version;
@@ -38,20 +39,22 @@ class VersionDetailsDialog extends StatelessWidget {
           child: SingleChildScrollView(
             child: BlocBuilder<BannerHistoryItemBloc, BannerHistoryItemState>(
               builder: (context, state) => state.maybeMap(
-                loadedState: (state) => Column(
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
-                  children: state.items
-                      .map(
-                        (e) => _VersionDetailPeriod(
-                          from: e.from,
-                          until: e.until,
-                          items: e.items,
-                          showCharacters: showCharacters,
-                          showWeapons: showWeapons,
-                        ),
-                      )
-                      .toList(),
-                ),
+                loadedState: (state) => state.items.isEmpty
+                    ? const NothingFoundColumn(mainAxisSize: MainAxisSize.min)
+                    : Column(
+                        crossAxisAlignment: CrossAxisAlignment.stretch,
+                        children: state.items
+                            .map(
+                              (e) => _VersionDetailPeriod(
+                                from: e.from,
+                                until: e.until,
+                                items: e.items,
+                                showCharacters: showCharacters,
+                                showWeapons: showWeapons,
+                              ),
+                            )
+                            .toList(),
+                      ),
                 orElse: () => const Loading(useScaffold: false),
               ),
             ),

diff --git a/lib/presentation/charts/charts_page.dart b/lib/presentation/charts/charts_page.dart
@@ -90,9 +90,6 @@ class ChartsPage extends StatelessWidget {
           create: (context) => Injection.chartGendersBloc..add(const ChartGendersEvent.init()),
         ),
       ],
-      //TODO: CHAR ROLE (VERTICAL BAR)
-      //TODO: CHARACTER MOST USED WEAPON TYPES (VERTICAL BAR)
-      //TODO: NUMBER OF RELEASED WEAPON TYPES
       child: Scaffold(
         appBar: AppBar(
           title: Text(s.charts),

diff --git a/lib/presentation/charts/widgets/horizontal_bar_chart.dart b/lib/presentation/charts/widgets/horizontal_bar_chart.dart
@@ -92,10 +92,6 @@ class HorizontalBarChart extends StatelessWidget {
                 reservedSize: 32,
                 interval: xIntervals,
                 getTitlesWidget: (value, meta) {
-                  if (!canValueBeRendered(value)) {
-                    return const SizedBox.shrink();
-                  }
-
                   final text = getBottomText(value);
                   return Padding(
                     padding: const EdgeInsets.only(top: 10.0),
@@ -143,13 +139,18 @@ class HorizontalBarChart extends StatelessWidget {
           lineBarsData: items
               .map(
                 (e) => LineChartBarData(
-                  isCurved: true,
+                  isCurved: false,
                   color: e.color,
                   barWidth: barWidth,
                   isStrokeCapRound: true,
                   dotData: FlDotData(show: true),
                   belowBarData: BarAreaData(show: false),
-                  spots: e.points.map((e) => FlSpot(e.x, e.y)).toList(),
+                  spots: e.points.map((e) {
+                    if (!canValueBeRendered(e.x)) {
+                      return FlSpot.nullSpot;
+                    }
+                    return FlSpot(e.x, e.y);
+                  }).toList(),
                 ),
               )
               .toList(),

diff --git a/lib/presentation/shared/dialogs/birthdays_per_month_dialog.dart b/lib/presentation/shared/dialogs/birthdays_per_month_dialog.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:shiori/application/birthdays_per_month/birthdays_per_month_bloc.dart';
+import 'package:shiori/application/bloc.dart';
 import 'package:shiori/domain/enums/enums.dart';
 import 'package:shiori/domain/models/models.dart';
 import 'package:shiori/domain/utils/date_utils.dart' as date_utils;
@@ -24,8 +24,8 @@ class BirthdaysPerMonthDialog extends StatelessWidget {
     final s = S.of(context);
     final theme = Theme.of(context);
     final mq = MediaQuery.of(context);
-    return BlocProvider<BirthdaysPerMonthBloc>(
-      create: (context) => Injection.birthdaysPerMonthBloc..add(BirthdaysPerMonthEvent.init(month: month)),
+    return BlocProvider<CharactersBirthdaysPerMonthBloc>(
+      create: (context) => Injection.charactersBirthdaysPerMonthBloc..add(CharactersBirthdaysPerMonthEvent.init(month: month)),
       child: AlertDialog(
         title: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -47,7 +47,7 @@ class BirthdaysPerMonthDialog extends StatelessWidget {
             child: Text(s.ok),
           )
         ],
-        content: BlocBuilder<BirthdaysPerMonthBloc, BirthdaysPerMonthState>(
+        content: BlocBuilder<CharactersBirthdaysPerMonthBloc, CharactersBirthdaysPerMonthState>(
           builder: (context, state) => state.maybeMap(
             loaded: (state) => state.characters.isEmpty
                 ? const NothingFoundColumn(mainAxisSize: MainAxisSize.min)