From 9810a1ce1cc3fee41c81f53e6eaa9d36b6a0df9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Fri, 8 Dec 2023 22:54:32 +0100
Subject: [PATCH] Improve navigation bar
---
android/gradle.properties | 4 ++--
fastlane/metadata/android/en-US/changelogs/48.txt | 1 +
fastlane/metadata/android/fr-FR/changelogs/48.txt | 1 +
lib/ui/skeleton.dart | 1 +
lib/ui/widgets/bottom_nav_bar.dart | 13 ++-----------
pubspec.yaml | 2 +-
6 files changed, 8 insertions(+), 14 deletions(-)
create mode 100644 fastlane/metadata/android/en-US/changelogs/48.txt
create mode 100644 fastlane/metadata/android/fr-FR/changelogs/48.txt
diff --git a/android/gradle.properties b/android/gradle.properties
index 2c9d43c..9afb4c6 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
-app.versionName=0.0.47
-app.versionCode=47
+app.versionName=0.0.48
+app.versionCode=48
diff --git a/fastlane/metadata/android/en-US/changelogs/48.txt b/fastlane/metadata/android/en-US/changelogs/48.txt
new file mode 100644
index 0000000..c35d703
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/48.txt
@@ -0,0 +1 @@
+Improve navigation bar.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/48.txt b/fastlane/metadata/android/fr-FR/changelogs/48.txt
new file mode 100644
index 0000000..7d09c55
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/48.txt
@@ -0,0 +1 @@
+Amélioration de la barre de navigation.
diff --git a/lib/ui/skeleton.dart b/lib/ui/skeleton.dart
index 5ff784f..9a720a7 100644
--- a/lib/ui/skeleton.dart
+++ b/lib/ui/skeleton.dart
@@ -36,6 +36,7 @@ class _SkeletonScreenState extends State<SkeletonScreen> {
return pageNavigation.elementAt(index);
},
pagination: SwiperPagination(
+ margin: const EdgeInsets.all(0),
builder: SwiperCustomPagination(
builder: (BuildContext context, SwiperPluginConfig config) {
return BottomNavBar(swipeController: config.controller);
diff --git a/lib/ui/widgets/bottom_nav_bar.dart b/lib/ui/widgets/bottom_nav_bar.dart
index c775a6a..8e00166 100644
--- a/lib/ui/widgets/bottom_nav_bar.dart
+++ b/lib/ui/widgets/bottom_nav_bar.dart
@@ -14,20 +14,11 @@ class BottomNavBar extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Card(
- margin: const EdgeInsets.only(
- top: 1,
- right: 0,
- left: 0,
- ),
+ margin: const EdgeInsets.all(0),
elevation: 4,
shadowColor: Theme.of(context).colorScheme.shadow,
color: Theme.of(context).colorScheme.surfaceVariant,
- shape: const RoundedRectangleBorder(
- borderRadius: BorderRadius.only(
- topLeft: Radius.circular(16),
- topRight: Radius.circular(16),
- ),
- ),
+ shape: const ContinuousRectangleBorder(),
child: BlocBuilder<BottomNavCubit, int>(
builder: (BuildContext context, int state) {
return BottomNavigationBar(
diff --git a/pubspec.yaml b/pubspec.yaml
index 6235665..2e058f8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Display scrobbles data and charts
publish_to: 'none'
-version: 0.0.47+47
+version: 0.0.48+48
environment:
sdk: '^3.0.0'
--
GitLab