Clean/move/rename/refactor code

lib/ui/widgets/app_bar.dart

 import 'package:flutter/material.dart';
 import 'package:unicons/unicons.dart';
 
-import '../widgets/header.dart';
+import 'package:scrobbles/ui/widgets/header_app.dart';
 
 class StandardAppBar extends StatelessWidget implements PreferredSizeWidget {
   final Function() notifyParent;
@@ -11,7 +11,7 @@ class StandardAppBar extends StatelessWidget implements PreferredSizeWidget {
   @override
   Widget build(BuildContext context) {
     return AppBar(
-      title: const Header(text: 'app_name'),
+      title: const AppHeader(text: 'app_name'),
       actions: [
         IconButton(
           onPressed: () {

lib/ui/widgets/bottom_nav_bar.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:ionicons/ionicons.dart';
 
-import '../../cubit/bottom_nav_cubit.dart';
+import 'package:scrobbles/cubit/bottom_nav_cubit.dart';
 
 class BottomNavBar extends StatelessWidget {
   const BottomNavBar({super.key});

lib/ui/widgets/card_content.dart

+import 'package:flutter/material.dart';
+
+class CardContent extends StatelessWidget {
+  const CardContent({
+    super.key,
+    required this.title,
+    required this.color,
+    required this.content,
+  });
+
+  final String title;
+  final Color color;
+  final Widget content;
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      elevation: 2,
+      shadowColor: Theme.of(context).colorScheme.shadow,
+      color: this.color,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(
+          Radius.circular(8),
+        ),
+      ),
+      child: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: <Widget>[
+            Text(
+              this.title,
+              style: Theme.of(context).primaryTextTheme.titleLarge!.apply(fontWeightDelta: 2),
+            ),
+            const SizedBox(height: 8),
+            this.content,
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/ui/widgets/cards/counts_by_day.dart

+import 'dart:convert';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+
+import 'package:scrobbles/models/counts_by_day.dart';
+import 'package:scrobbles/network/scrobbles.dart';
+import 'package:scrobbles/ui/widgets/card_content.dart';
+import 'package:scrobbles/ui/widgets/charts/counts_by_day.dart';
+import 'package:scrobbles/ui/widgets/error.dart';
+
+class CardCountsByDay extends StatelessWidget {
+  const CardCountsByDay({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final int daysCount = 21;
+    late Future<CountsByDayData> future = ScrobblesApi.fetchCountsByDay(daysCount);
+
+    return FutureBuilder<CountsByDayData>(
+      future: future,
+      builder: (context, snapshot) {
+        if (snapshot.hasError) {
+          return ShowErrorWidget(message: '${snapshot.error}');
+        }
+
+        return CardContent(
+          color: Theme.of(context).colorScheme.surface,
+          title: 'counts_by_day'.tr(
+            namedArgs: {
+              'daysCount': daysCount.toString(),
+            },
+          ),
+          content: ChartCountsByDay(
+            chartData: snapshot.hasData
+                ? CountsByDayData.fromJson(jsonDecode(snapshot.data.toString()))
+                : CountsByDayData.createEmpty(),
+            isLoading: !snapshot.hasData,
+          ),
+        );
+      },
+    );
+  }
+}

lib/ui/widgets/cards/counts_by_hour.dart

+import 'dart:convert';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+
+import 'package:scrobbles/models/counts_by_hour.dart';
+import 'package:scrobbles/network/scrobbles.dart';
+import 'package:scrobbles/ui/widgets/card_content.dart';
+import 'package:scrobbles/ui/widgets/charts/counts_by_hour.dart';
+import 'package:scrobbles/ui/widgets/error.dart';
+
+class CardCountsByHour extends StatelessWidget {
+  const CardCountsByHour({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final int daysCount = 21;
+    late Future<CountsByHourData> future = ScrobblesApi.fetchCountsByHour(daysCount);
+
+    return FutureBuilder<CountsByHourData>(
+      future: future,
+      builder: (context, snapshot) {
+        if (snapshot.hasError) {
+          return ShowErrorWidget(message: '${snapshot.error}');
+        }
+
+        return CardContent(
+          color: Theme.of(context).colorScheme.surface,
+          title: 'counts_by_hour'.tr(
+            namedArgs: {
+              'daysCount': daysCount.toString(),
+            },
+          ),
+          content: ChartCountsByHour(
+            chartData: snapshot.hasData
+                ? CountsByHourData.fromJson(jsonDecode(snapshot.data.toString()))
+                : CountsByHourData.createEmpty(),
+            isLoading: !snapshot.hasData,
+          ),
+        );
+      },
+    );
+  }
+}

lib/ui/widgets/cards/discoveries.dart

+import 'dart:convert';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+
+import 'package:scrobbles/models/discoveries.dart';
+import 'package:scrobbles/network/scrobbles.dart';
+import 'package:scrobbles/ui/widgets/card_content.dart';
+import 'package:scrobbles/ui/widgets/charts/discoveries_artists.dart';
+import 'package:scrobbles/ui/widgets/charts/discoveries_tracks.dart';
+import 'package:scrobbles/ui/widgets/error.dart';
+
+class CardDiscoveries extends StatelessWidget {
+  const CardDiscoveries({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final int daysCount = 14;
+    late Future<DiscoveriesData> future = ScrobblesApi.fetchDiscoveries(daysCount);
+
+    return FutureBuilder<DiscoveriesData>(
+      future: future,
+      builder: (context, snapshot) {
+        if (snapshot.hasError) {
+          return ShowErrorWidget(message: '${snapshot.error}');
+        }
+
+        final TextTheme textTheme = Theme.of(context).primaryTextTheme;
+
+        return CardContent(
+          color: Theme.of(context).colorScheme.surface,
+          title: 'discoveries_title'.tr(
+            namedArgs: {
+              'daysCount': daysCount.toString(),
+            },
+          ),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                'discoveries_artists_title',
+                style: textTheme.titleMedium!.apply(fontWeightDelta: 2),
+              ).tr(),
+              const SizedBox(height: 8),
+              ChartDiscoveriesArtists(
+                chartData: DiscoveriesData.fromJson(jsonDecode(snapshot.data.toString())),
+                isLoading: !snapshot.hasData,
+              ),
+              const SizedBox(height: 8),
+              Text(
+                'discoveries_tracks_title',
+                style: textTheme.titleMedium!.apply(fontWeightDelta: 2),
+              ).tr(),
+              const SizedBox(height: 8),
+              ChartDiscoveriesTracks(
+                chartData: DiscoveriesData.fromJson(jsonDecode(snapshot.data.toString())),
+                isLoading: !snapshot.hasData,
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}

lib/ui/widgets/main_screen/statistics_global_card.dart → lib/ui/widgets/cards/statistics_global.dart

 import 'dart:convert';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
-import '../../../models/statistics_global.dart';
-import '../../../network/scrobbles_api.dart';
-import '../../../ui/widgets/error.dart';
-import 'statistics_global_content.dart';
+import 'package:scrobbles/models/statistics_global.dart';
+import 'package:scrobbles/network/scrobbles.dart';
+import 'package:scrobbles/ui/widgets/card_content.dart';
+import 'package:scrobbles/ui/widgets/content/statistics_global.dart';
+import 'package:scrobbles/ui/widgets/error.dart';
 
-class StatisticsGlobalCard extends StatelessWidget {
-  const StatisticsGlobalCard({super.key});
+class CardStatisticsGlobal extends StatelessWidget {
+  const CardStatisticsGlobal({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -21,24 +23,15 @@ class StatisticsGlobalCard extends StatelessWidget {
           return ShowErrorWidget(message: '${snapshot.error}');
         }
 
-        return Card(
-          elevation: 2,
-          shadowColor: Theme.of(context).colorScheme.shadow,
+        return CardContent(
           color: Theme.of(context).colorScheme.primary,
-          shape: const RoundedRectangleBorder(
-            borderRadius: BorderRadius.all(
-              Radius.circular(8),
-            ),
-          ),
-          child: Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: StatisticsGlobalContent(
+          title: 'global_statistics'.tr(),
+          content: ContentStatisticsGlobal(
             statistics: snapshot.hasData
                 ? StatisticsGlobalData.fromJson(jsonDecode(snapshot.data.toString()))
                 : StatisticsGlobalData.createEmpty(),
             isLoading: !snapshot.hasData,
           ),
-          ),
         );
       },
     );

lib/ui/widgets/main_screen/statistics_recent_card.dart → lib/ui/widgets/cards/statistics_recent.dart

 import 'dart:convert';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
-import '../../../models/statistics_recent.dart';
-import '../../../network/scrobbles_api.dart';
-import '../../../ui/widgets/error.dart';
-import 'statistics_recent_content.dart';
+import 'package:scrobbles/models/statistics_recent.dart';
+import 'package:scrobbles/network/scrobbles.dart';
+import 'package:scrobbles/ui/widgets/card_content.dart';
+import 'package:scrobbles/ui/widgets/content/statistics_recent.dart';
+import 'package:scrobbles/ui/widgets/error.dart';
 
-class StatisticsRecentCard extends StatelessWidget {
-  const StatisticsRecentCard({super.key});
+class CardStatisticsRecent extends StatelessWidget {
+  const CardStatisticsRecent({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -23,24 +25,19 @@ class StatisticsRecentCard extends StatelessWidget {
           return ShowErrorWidget(message: '${snapshot.error}');
         }
 
-        return Card(
-          elevation: 2,
-          shadowColor: Theme.of(context).colorScheme.shadow,
+        return CardContent(
           color: Theme.of(context).colorScheme.primary,
-          shape: const RoundedRectangleBorder(
-            borderRadius: BorderRadius.all(
-              Radius.circular(8),
-            ),
+          title: 'recent_statistics'.tr(
+            namedArgs: {
+              'daysCount': daysCount.toString(),
+            },
           ),
-          child: Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: StatisticsRecentContent(
+          content: ContentStatisticsRecent(
             statistics: snapshot.hasData
                 ? StatisticsRecentData.fromJson(jsonDecode(snapshot.data.toString()))
                 : StatisticsRecentData.createEmpty(),
             isLoading: !snapshot.hasData,
           ),
-          ),
         );
       },
     );

lib/ui/widgets/cards/timeline.dart

+import 'dart:convert';
+
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+
+import 'package:scrobbles/models/timeline.dart';
+import 'package:scrobbles/network/scrobbles.dart';
+import 'package:scrobbles/ui/widgets/card_content.dart';
+import 'package:scrobbles/ui/widgets/charts/timeline_counts.dart';
+import 'package:scrobbles/ui/widgets/charts/timeline_eclecticism.dart';
+import 'package:scrobbles/ui/widgets/error.dart';
+
+class CardTimeline extends StatelessWidget {
+  const CardTimeline({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final int daysCount = 14;
+    late Future<TimelineData> future = ScrobblesApi.fetchTimeline(daysCount);
+
+    return FutureBuilder<TimelineData>(
+      future: future,
+      builder: (context, snapshot) {
+        if (snapshot.hasError) {
+          return ShowErrorWidget(message: '${snapshot.error}');
+        }
+
+        return CardContent(
+          color: Theme.of(context).colorScheme.surface,
+          title: 'timeline_title'.tr(
+            namedArgs: {
+              'daysCount': daysCount.toString(),
+            },
+          ),
+          content: Stack(
+            children: [
+              ChartTimelineCounts(
+                chartData: TimelineData.fromJson(jsonDecode(snapshot.data.toString())),
+                isLoading: !snapshot.hasData,
+              ),
+              ChartTimelineEclecticism(
+                chartData: TimelineData.fromJson(jsonDecode(snapshot.data.toString())),
+                isLoading: !snapshot.hasData,
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}

lib/ui/widgets/main_screen/topartists_card.dart → lib/ui/widgets/cards/top_artists.dart

 import 'dart:convert';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
-import '../../../models/topartists.dart';
-import '../../../network/scrobbles_api.dart';
-import '../../../ui/widgets/error.dart';
-import '../../../ui/widgets/main_screen/topartists_content.dart';
+import 'package:scrobbles/models/topartists.dart';
+import 'package:scrobbles/network/scrobbles.dart';
+import 'package:scrobbles/ui/widgets/card_content.dart';
+import 'package:scrobbles/ui/widgets/charts/top_artists.dart';
+import 'package:scrobbles/ui/widgets/error.dart';
 
-class ChartTopArtistsCard extends StatelessWidget {
-  const ChartTopArtistsCard({super.key});
+class CardTopArtists extends StatelessWidget {
+  const CardTopArtists({super.key});
 
   @override
   Widget build(BuildContext context) {
     final int daysCount = 14;
-    late Future<TopArtistsData> futureTimeline = ScrobblesApi.fetchTopArtists(daysCount);
+    late Future<TopArtistsData> future = ScrobblesApi.fetchTopArtists(daysCount);
 
     return FutureBuilder<TopArtistsData>(
-      future: futureTimeline,
+      future: future,
       builder: (context, snapshot) {
         if (snapshot.hasError) {
           return ShowErrorWidget(message: '${snapshot.error}');
         }
 
-        return Card(
-          elevation: 2,
-          shadowColor: Theme.of(context).colorScheme.shadow,
+        return CardContent(
           color: Theme.of(context).colorScheme.surface,
-          shape: const RoundedRectangleBorder(
-            borderRadius: BorderRadius.all(
-              Radius.circular(8),
-            ),
+          title: 'top_artists_title'.tr(
+            namedArgs: {
+              'daysCount': daysCount.toString(),
+            },
           ),
-          child: Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: ChartTopArtistsCardContent(
-              daysCount: daysCount,
+          content: ChartTopArtists(
             chartData: snapshot.hasData
                 ? TopArtistsData.fromJson(jsonDecode(snapshot.data.toString()))
                 : TopArtistsData.createEmpty(),
             isLoading: !snapshot.hasData,
           ),
-          ),
         );
       },
     );

lib/ui/widgets/main_screen/counts_by_day_chart.dart → lib/ui/widgets/charts/counts_by_day.dart

@@ -2,14 +2,15 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
 
-import '../../../config/app_colors.dart';
-import '../../../models/counts_by_day.dart';
-import '../../../ui/widgets/charts/custom_bar_chart.dart';
+import 'package:scrobbles/config/app_colors.dart';
+import 'package:scrobbles/models/counts_by_day.dart';
+import 'package:scrobbles/ui/widgets/abstracts/custom_bar_chart.dart';
 
-class CountsByDayCardContentChart extends CustomBarChart {
+class ChartCountsByDay extends CustomBarChart {
   final CountsByDayData chartData;
+  final bool isLoading;
 
-  CountsByDayCardContentChart({super.key, required this.chartData});
+  ChartCountsByDay({super.key, required this.chartData, required this.isLoading});
 
   final double verticalTicksInterval = 5;
   final String verticalAxisTitleSuffix = '%';
@@ -18,12 +19,19 @@ class CountsByDayCardContentChart extends CustomBarChart {
   Widget build(BuildContext context) {
     return Container(
       height: this.chartHeight,
-      child: LayoutBuilder(builder: (context, constraints) {
+      child: this.isLoading
+          ? this.placeholder
+          : LayoutBuilder(
+              builder: (context, constraints) {
+                final double maxWidth = constraints.maxWidth;
+                final int barsCount = this.chartData.data.keys.length;
+
                 return getBarChart(
-          barWidth: this.getBarWidth(constraints.maxWidth, this.chartData.data.keys.length),
+                  barWidth: this.getBarWidth(maxWidth, barsCount),
                   backgroundColor: Theme.of(context).colorScheme.onSurface,
                 );
-      }),
+              },
+            ),
     );
   }
 

lib/ui/widgets/main_screen/counts_by_hour_chart.dart → lib/ui/widgets/charts/counts_by_hour.dart

 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
 
-import '../../../config/app_colors.dart';
-import '../../../models/counts_by_hour.dart';
-import '../../../ui/widgets/charts/custom_bar_chart.dart';
-import '../../../utils/color_extensions.dart';
+import 'package:scrobbles/config/app_colors.dart';
+import 'package:scrobbles/models/counts_by_hour.dart';
+import 'package:scrobbles/ui/widgets/abstracts/custom_bar_chart.dart';
+import 'package:scrobbles/utils/color_extensions.dart';
 
-class CountsByHourCardContentChart extends CustomBarChart {
+class ChartCountsByHour extends CustomBarChart {
   final CountsByHourData chartData;
+  final bool isLoading;
 
-  CountsByHourCardContentChart({super.key, required this.chartData});
+  ChartCountsByHour({super.key, required this.chartData, required this.isLoading});
 
   final double verticalTicksInterval = 5;
   final String verticalAxisTitleSuffix = '%';
@@ -18,12 +19,19 @@ class CountsByHourCardContentChart extends CustomBarChart {
   Widget build(BuildContext context) {
     return Container(
       height: this.chartHeight,
-      child: LayoutBuilder(builder: (context, constraints) {
+      child: this.isLoading
+          ? this.placeholder
+          : LayoutBuilder(
+              builder: (context, constraints) {
+                final double maxWidth = constraints.maxWidth;
+                final int barsCount = this.chartData.data.keys.length;
+
                 return getBarChart(
-          barWidth: this.getBarWidth(constraints.maxWidth, this.chartData.data.keys.length),
+                  barWidth: this.getBarWidth(maxWidth, barsCount),
                   backgroundColor: Theme.of(context).colorScheme.onSurface,
                 );
-      }),
+              },
+            ),
     );
   }
 

lib/ui/widgets/main_screen/discoveries_chart_artists.dart → lib/ui/widgets/charts/discoveries_artists.dart

 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
 
-import '../../../config/app_colors.dart';
-import '../../../models/discoveries.dart';
-import '../../../utils/color_extensions.dart';
-import '../../../ui/widgets/charts/custom_bar_chart.dart';
+import 'package:scrobbles/config/app_colors.dart';
+import 'package:scrobbles/models/discoveries.dart';
+import 'package:scrobbles/ui/widgets/abstracts/custom_bar_chart.dart';
+import 'package:scrobbles/utils/color_extensions.dart';
 
 class ChartDiscoveriesArtists extends CustomBarChart {
   final DiscoveriesData chartData;
+  final bool isLoading;
 
-  ChartDiscoveriesArtists({super.key, required this.chartData});
+  ChartDiscoveriesArtists({super.key, required this.chartData, required this.isLoading});
 
   @override
   Widget build(BuildContext context) {
     return Container(
       height: this.chartHeight,
-      child: LayoutBuilder(builder: (context, constraints) {
+      child: this.isLoading
+          ? this.placeholder
+          : LayoutBuilder(
+              builder: (context, constraints) {
+                final double maxWidth = constraints.maxWidth;
+                final int barsCount = this.chartData.data.keys.length;
+
                 return getBarChart(
-          barWidth: this.getBarWidth(constraints.maxWidth, this.chartData.data.keys.length),
+                  barWidth: this.getBarWidth(maxWidth, barsCount),
                   backgroundColor: Theme.of(context).colorScheme.onSurface,
                 );
-      }),
+              },
+            ),
     );
   }
 

lib/ui/widgets/main_screen/discoveries_chart_tracks.dart → lib/ui/widgets/charts/discoveries_tracks.dart

 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
 
-import '../../../config/app_colors.dart';
-import '../../../models/discoveries.dart';
-import '../../../utils/color_extensions.dart';
-import '../../../ui/widgets/charts/custom_bar_chart.dart';
+import 'package:scrobbles/config/app_colors.dart';
+import 'package:scrobbles/models/discoveries.dart';
+import 'package:scrobbles/ui/widgets/abstracts/custom_bar_chart.dart';
+import 'package:scrobbles/utils/color_extensions.dart';
 
 class ChartDiscoveriesTracks extends CustomBarChart {
   final DiscoveriesData chartData;
+  final bool isLoading;
 
-  ChartDiscoveriesTracks({super.key, required this.chartData});
+  ChartDiscoveriesTracks({super.key, required this.chartData, required this.isLoading});
 
   @override
   Widget build(BuildContext context) {
     return Container(
       height: this.chartHeight,
-      child: LayoutBuilder(builder: (context, constraints) {
+      child: this.isLoading
+          ? this.placeholder
+          : LayoutBuilder(
+              builder: (context, constraints) {
+                final double maxWidth = constraints.maxWidth;
+                final int barsCount = this.chartData.data.keys.length;
+
                 return getBarChart(
-          barWidth: this.getBarWidth(constraints.maxWidth, this.chartData.data.keys.length),
+                  barWidth: this.getBarWidth(maxWidth, barsCount),
                   backgroundColor: Theme.of(context).colorScheme.onSurface,
                 );
-      }),
+              },
+            ),
     );
   }
 

lib/ui/widgets/main_screen/timeline_chart_counts.dart → lib/ui/widgets/charts/timeline_counts.dart

 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
 
-import '../../../config/app_colors.dart';
-import '../../../models/timeline.dart';
-import '../../../ui/widgets/charts/custom_bar_chart.dart';
+import 'package:scrobbles/config/app_colors.dart';
+import 'package:scrobbles/models/timeline.dart';
+import 'package:scrobbles/ui/widgets/abstracts/custom_bar_chart.dart';
 
 class ChartTimelineCounts extends CustomBarChart {
   final TimelineData chartData;
+  final bool isLoading;
 
-  ChartTimelineCounts({super.key, required this.chartData});
+  ChartTimelineCounts({super.key, required this.chartData, required this.isLoading});
 
   final double verticalTicksInterval = 50;
 
@@ -16,12 +17,19 @@ class ChartTimelineCounts extends CustomBarChart {
   Widget build(BuildContext context) {
     return Container(
       height: this.chartHeight,
-      child: LayoutBuilder(builder: (context, constraints) {
+      child: this.isLoading
+          ? this.placeholder
+          : LayoutBuilder(
+              builder: (context, constraints) {
+                final double maxWidth = constraints.maxWidth;
+                final int barsCount = this.chartData.data.keys.length;
+
                 return getBarChart(
-          barWidth: this.getBarWidth(constraints.maxWidth, this.chartData.data.keys.length),
+                  barWidth: this.getBarWidth(maxWidth, barsCount),
                   backgroundColor: Theme.of(context).colorScheme.onSurface,
                 );
-      }),
+              },
+            ),
     );
   }
 

lib/ui/widgets/main_screen/timeline_chart_eclecticism.dart → lib/ui/widgets/charts/timeline_eclecticism.dart

 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
 
-import '../../../config/app_colors.dart';
-import '../../../models/timeline.dart';
-import '../../../ui/widgets/charts/custom_line_chart.dart';
-import '../../../utils/color_extensions.dart';
+import 'package:scrobbles/config/app_colors.dart';
+import 'package:scrobbles/models/timeline.dart';
+import 'package:scrobbles/ui/widgets/abstracts/custom_line_chart.dart';
+import 'package:scrobbles/utils/color_extensions.dart';
 
 class ChartTimelineEclecticism extends CustomLineChart {
   final TimelineData chartData;
+  final bool isLoading;
 
-  ChartTimelineEclecticism({super.key, required this.chartData});
+  ChartTimelineEclecticism({super.key, required this.chartData, required this.isLoading});
 
   @override
   Widget build(BuildContext context) {
@@ -17,7 +18,9 @@ class ChartTimelineEclecticism extends CustomLineChart {
 
     return Container(
       height: this.chartHeight,
-      child: LineChart(
+      child: this.isLoading
+          ? this.placeholder
+          : LineChart(
               LineChartData(
                 lineBarsData: getDataEclecticism(),
                 borderData: getBorderData(),

lib/ui/widgets/main_screen/topartists_chart.dart → lib/ui/widgets/charts/top_artists.dart

 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
 
-import '../../../config/app_colors.dart';
-import '../../../models/topartists.dart';
-import '../../../utils/color_extensions.dart';
+import 'package:scrobbles/config/app_colors.dart';
+import 'package:scrobbles/models/topartists.dart';
+import 'package:scrobbles/utils/color_extensions.dart';
 
 class ChartTopArtists extends StatelessWidget {
   final TopArtistsData chartData;
+  final bool isLoading;
 
-  ChartTopArtists({super.key, required this.chartData});
+  ChartTopArtists({super.key, required this.chartData, required this.isLoading});
+
+  final Widget placeholder = Text('⏳');
 
   @override
   Widget build(BuildContext context) {
     return AspectRatio(
       aspectRatio: 2.1,
-      child: Row(
+      child: this.isLoading
+          ? this.placeholder
+          : Row(
               children: <Widget>[
                 Expanded(
                   child: AspectRatio(

lib/ui/widgets/main_screen/statistics_global_content.dart → lib/ui/widgets/content/statistics_global.dart

 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
-import '../../../models/statistics_global.dart';
+import 'package:scrobbles/models/statistics_global.dart';
 
-class StatisticsGlobalContent extends StatelessWidget {
+class ContentStatisticsGlobal extends StatelessWidget {
   final StatisticsGlobalData statistics;
   final bool isLoading;
 
-  const StatisticsGlobalContent(
+  const ContentStatisticsGlobal(
       {super.key, required this.statistics, required this.isLoading});
 
   @override
   Widget build(BuildContext context) {
     final TextTheme textTheme = Theme.of(context).primaryTextTheme;
-
-    final String placeholder = '⏳';
+    const String placeholder = '⏳';
 
     return Column(
       mainAxisSize: MainAxisSize.min,
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[
-        Text(
-          'global_statistics',
-          style: textTheme.titleLarge!.apply(fontWeightDelta: 2),
-        ).tr(),
         Text(
           'statistics_total_scrobbles_count',
           style: textTheme.bodyMedium,

lib/ui/widgets/main_screen/statistics_recent_content.dart → lib/ui/widgets/content/statistics_recent.dart

 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
-import '../../../models/statistics_recent.dart';
+import 'package:scrobbles/models/statistics_recent.dart';
 
-class StatisticsRecentContent extends StatelessWidget {
+class ContentStatisticsRecent extends StatelessWidget {
   final StatisticsRecentData statistics;
   final bool isLoading;
 
-  const StatisticsRecentContent(
+  const ContentStatisticsRecent(
       {super.key, required this.statistics, required this.isLoading});
 
   @override
   Widget build(BuildContext context) {
     final TextTheme textTheme = Theme.of(context).primaryTextTheme;
-
-    final String placeholder = '⏳';
+    const String placeholder = '⏳';
 
     return Column(
       mainAxisSize: MainAxisSize.min,
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[
-        Text(
-          'recent_statistics',
-          style: textTheme.titleLarge!.apply(fontWeightDelta: 2),
-        ).tr(),
-        Text(
-          'statistics_selected_period',
-          style: textTheme.bodyMedium!.apply(fontWeightDelta: 2),
-        ).tr(
-          namedArgs: {
-            'daysCount':
-                this.isLoading ? placeholder : this.statistics.selectedPeriod.toString(),
-          },
-        ),
         Text(
           'statistics_recent_scrobbles_count_and_discoveries',
           style: textTheme.bodyMedium,

lib/ui/widgets/header.dart → lib/ui/widgets/header_app.dart

 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
-class Header extends StatelessWidget {
-  const Header({super.key, required this.text});
+class AppHeader extends StatelessWidget {
+  const AppHeader({super.key, required this.text});
 
   final String text;