Improve swipe navigation

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.30
-app.versionCode=30
+app.versionName=0.0.31
+app.versionCode=31

fastlane/metadata/android/en-US/changelogs/31.txt

+Improve swipe navigation.

fastlane/metadata/android/fr-FR/changelogs/31.txt

+Amélioration de la navigation par swipe.

lib/cubit/bottom_nav_cubit.dart

@@ -3,18 +3,25 @@ import 'package:hydrated_bloc/hydrated_bloc.dart';
 class BottomNavCubit extends HydratedCubit<int> {
   BottomNavCubit() : super(0);
 
-  void updateIndex(int index) => emit(index);
+  int pagesCount = 3;
 
-  void movePrevious() => emit((state > 0) ? state - 1 : state);
-  void moveNext() => emit((state < 2) ? state + 1 : state);
+  void updateIndex(int index) {
+    if (isIndexAllowed(index)) {
+      emit(index);
+    } else {
+      goToHomePage();
+    }
+  }
+
+  bool isIndexAllowed(int index) {
+    return (index >= 0) && (index < pagesCount);
+  }
 
-  void getHomePage() => emit(0);
-  void getDiscoveriesPage() => emit(1);
-  void getStatisticsPage() => emit(2);
+  void goToHomePage() => emit(0);
 
   @override
   int? fromJson(Map<String, dynamic> json) {
-    return json['pageIndex'] as int?;
+    return 0;
   }
 
   @override

lib/ui/skeleton.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_swipe/flutter_swipe.dart';
 
 import 'package:scrobbles/cubit/bottom_nav_cubit.dart';
 import 'package:scrobbles/ui/screens/discoveries.dart';
@@ -28,28 +29,31 @@ class _SkeletonScreenState extends State<SkeletonScreen> {
       create: (BuildContext context) => BottomNavCubit(),
       child: BlocBuilder<BottomNavCubit, int>(
         builder: (BuildContext context, int state) {
-          return GestureDetector(
-            onHorizontalDragEnd: (dragDetail) {
-              if (dragDetail.velocity.pixelsPerSecond.dx < 1) {
-                context.read<BottomNavCubit>().moveNext();
-              } else {
-                context.read<BottomNavCubit>().movePrevious();
-              }
-            },
-            child: Scaffold(
-              appBar: StandardAppBar(notifyParent: refresh),
-              extendBodyBehindAppBar: false,
-              body: BlocBuilder<BottomNavCubit, int>(
-                builder: (BuildContext context, int state) {
-                  return AnimatedSwitcher(
-                    duration: const Duration(milliseconds: 300),
-                    child: pageNavigation.elementAt(state),
-                  );
-                },
+          return Scaffold(
+            appBar: StandardAppBar(notifyParent: refresh),
+            extendBodyBehindAppBar: false,
+            body: Swiper(
+              itemCount: BlocProvider.of<BottomNavCubit>(context).pagesCount,
+              itemBuilder: (BuildContext context, int index) {
+                return AnimatedSwitcher(
+                  duration: const Duration(milliseconds: 300),
+                  child: pageNavigation.elementAt(index),
+                );
+              },
+              pagination: SwiperPagination(
+                builder: SwiperCustomPagination(
+                  builder: (BuildContext context, SwiperPluginConfig config) {
+                    return BottomNavBar(swipeController: config.controller);
+                  },
+                ),
               ),
-              bottomNavigationBar: const BottomNavBar(),
-              backgroundColor: Theme.of(context).colorScheme.background,
+              onIndexChanged: (newPageIndex) {
+                BlocProvider.of<BottomNavCubit>(context).updateIndex(newPageIndex);
+              },
+              outer: true,
+              loop: false,
             ),
+            backgroundColor: Theme.of(context).colorScheme.background,
           );
         },
       ),

lib/ui/widgets/bottom_nav_bar.dart

 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_swipe/flutter_swipe.dart';
 import 'package:ionicons/ionicons.dart';
 
 import 'package:scrobbles/cubit/bottom_nav_cubit.dart';
 
 class BottomNavBar extends StatelessWidget {
-  const BottomNavBar({super.key});
+  const BottomNavBar({super.key, required this.swipeController});
+
+  final SwiperController swipeController;
 
   @override
   Widget build(BuildContext context) {
     return Card(
-      margin: const EdgeInsets.only(top: 1, right: 4, left: 4),
+      margin: const EdgeInsets.only(
+        top: 1,
+        right: 0,
+        left: 0,
+      ),
       elevation: 4,
       shadowColor: Theme.of(context).colorScheme.shadow,
       color: Theme.of(context).colorScheme.surfaceVariant,
@@ -25,7 +32,10 @@ class BottomNavBar extends StatelessWidget {
         builder: (BuildContext context, int state) {
           return BottomNavigationBar(
             currentIndex: state,
-            onTap: (int index) => context.read<BottomNavCubit>().updateIndex(index),
+            onTap: (int index) {
+              context.read<BottomNavCubit>().updateIndex(index);
+              swipeController.move(index);
+            },
             type: BottomNavigationBarType.fixed,
             elevation: 0,
             backgroundColor: Colors.transparent,

pubspec.lock

@@ -123,6 +123,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_swipe:
+    dependency: "direct main"
+    description:
+      name: flutter_swipe
+      sha256: dc6541bac3a0545ce15a3fa15913f6250532062960bf6b0ad4562d02f14a8545
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
   flutter_web_plugins:
     dependency: transitive
     description: flutter

pubspec.yaml

@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
 
 publish_to: 'none'
 
-version: 0.0.30+30
+version: 0.0.31+31
 
 environment:
   sdk: '^3.0.0'
@@ -21,6 +21,7 @@ dependencies:
   hydrated_bloc: ^9.0.0
   ionicons: ^0.2.2
   unicons: ^2.1.1
+  flutter_swipe: ^1.0.1
 
 flutter:
   uses-material-design: false