From ec4a27496129fd746bf6607404bf8f8bc199f3e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Wed, 15 Nov 2023 12:20:27 +0100
Subject: [PATCH] Clean some code
---
android/gradle.properties | 4 ++--
lib/main.dart | 4 ++--
lib/ui/painters/graph_painter.dart | 2 +-
lib/ui/screens/about_page.dart | 4 ++--
lib/ui/screens/demo_page.dart | 20 +++++++++----------
lib/ui/screens/graph_page.dart | 2 +-
lib/ui/screens/settings_page.dart | 6 +++---
.../skeleton_screen.dart => skeleton.dart} | 18 ++++++++---------
lib/ui/widgets/app_bar.dart | 4 ++--
lib/ui/widgets/bottom_nav_bar.dart | 12 +++++------
.../widgets/{header.dart => header_app.dart} | 4 ++--
lib/ui/widgets/settings_form.dart | 4 ++--
pubspec.lock | 8 --------
pubspec.yaml | 3 +--
14 files changed, 41 insertions(+), 54 deletions(-)
rename lib/ui/{screens/skeleton_screen.dart => skeleton.dart} (81%)
rename lib/ui/widgets/{header.dart => header_app.dart} (78%)
diff --git a/android/gradle.properties b/android/gradle.properties
index 19cb4cf..c184c0b 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=1.0.30
-app.versionCode=31
+app.versionName=1.0.31
+app.versionCode=32
diff --git a/lib/main.dart b/lib/main.dart
index 9473729..f05fb0c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -6,8 +6,8 @@ import 'package:hive/hive.dart';
import 'package:hydrated_bloc/hydrated_bloc.dart';
import 'package:path_provider/path_provider.dart';
-import 'ui/screens/skeleton_screen.dart';
-import 'config/theme.dart';
+import 'package:random/config/theme.dart';
+import 'package:random/ui/skeleton.dart';
void main() async {
/// Initialize packages
diff --git a/lib/ui/painters/graph_painter.dart b/lib/ui/painters/graph_painter.dart
index 2556db6..90c17a4 100644
--- a/lib/ui/painters/graph_painter.dart
+++ b/lib/ui/painters/graph_painter.dart
@@ -2,7 +2,7 @@ import 'dart:math';
import 'package:flutter/material.dart';
-import '../../config/app_colors.dart';
+import 'package:random/config/app_colors.dart';
class GraphPainter extends CustomPainter {
const GraphPainter();
diff --git a/lib/ui/screens/about_page.dart b/lib/ui/screens/about_page.dart
index 5a66139..a93505a 100644
--- a/lib/ui/screens/about_page.dart
+++ b/lib/ui/screens/about_page.dart
@@ -2,7 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:package_info_plus/package_info_plus.dart';
-import '../widgets/header.dart';
+import 'package:random/ui/widgets/header_app.dart';
class AboutPage extends StatelessWidget {
const AboutPage({super.key});
@@ -15,7 +15,7 @@ class AboutPage extends StatelessWidget {
mainAxisSize: MainAxisSize.max,
children: <Widget>[
SizedBox(height: 8),
- Header(text: 'about_title'),
+ AppHeader(text: 'about_title'),
Text('about_content').tr(),
FutureBuilder<PackageInfo>(
future: PackageInfo.fromPlatform(),
diff --git a/lib/ui/screens/demo_page.dart b/lib/ui/screens/demo_page.dart
index 4eff438..b488381 100644
--- a/lib/ui/screens/demo_page.dart
+++ b/lib/ui/screens/demo_page.dart
@@ -1,13 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ionicons/ionicons.dart';
+import 'package:unicons/unicons.dart';
-import '../../config/theme.dart';
-
-import '../../cubit/data_cubit.dart';
-import '../../cubit/settings_cubit.dart';
-
-import '../widgets/header.dart';
+import 'package:random/config/theme.dart';
+import 'package:random/cubit/data_cubit.dart';
+import 'package:random/cubit/settings_cubit.dart';
+import 'package:random/ui/widgets/header_app.dart';
class DemoPage extends StatelessWidget {
const DemoPage({super.key});
@@ -21,13 +19,13 @@ class DemoPage extends StatelessWidget {
physics: const BouncingScrollPhysics(),
children: <Widget>[
SizedBox(height: 8),
- Header(text: 'TOP'),
+ AppHeader(text: 'TOP'),
SizedBox(height: 20),
persistedCounterBlock(),
SizedBox(height: 20),
fakeApiCall(),
SizedBox(height: 20),
- Header(text: 'BOTTOM'),
+ AppHeader(text: 'BOTTOM'),
],
),
);
@@ -49,7 +47,7 @@ class DemoPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
IconButton(
- icon: Icon(Ionicons.arrow_down),
+ icon: Icon(UniconsSolid.arrow_circle_down),
color: appTheme.primaryColor,
onPressed: () => updateCounter(-1),
),
@@ -58,7 +56,7 @@ class DemoPage extends StatelessWidget {
child: Text(state.counter.toString()),
),
IconButton(
- icon: Icon(Ionicons.arrow_up),
+ icon: Icon(UniconsSolid.arrow_circle_up),
color: appTheme.primaryColor,
onPressed: () => updateCounter(1),
),
diff --git a/lib/ui/screens/graph_page.dart b/lib/ui/screens/graph_page.dart
index 899eb04..a0cfb1c 100644
--- a/lib/ui/screens/graph_page.dart
+++ b/lib/ui/screens/graph_page.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
-import '../painters/graph_painter.dart';
+import 'package:random/ui/painters/graph_painter.dart';
class GraphPage extends StatelessWidget {
const GraphPage({super.key});
diff --git a/lib/ui/screens/settings_page.dart b/lib/ui/screens/settings_page.dart
index 1cd8e33..3e0195d 100644
--- a/lib/ui/screens/settings_page.dart
+++ b/lib/ui/screens/settings_page.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
-import '../widgets/header.dart';
-import '../widgets/settings_form.dart';
+import 'package:random/ui/widgets/header_app.dart';
+import 'package:random/ui/widgets/settings_form.dart';
class SettingsPage extends StatelessWidget {
const SettingsPage({super.key});
@@ -14,7 +14,7 @@ class SettingsPage extends StatelessWidget {
mainAxisSize: MainAxisSize.max,
children: <Widget>[
SizedBox(height: 8),
- Header(text: 'settings_title'),
+ AppHeader(text: 'settings_title'),
SizedBox(height: 8),
SettingsForm(),
],
diff --git a/lib/ui/screens/skeleton_screen.dart b/lib/ui/skeleton.dart
similarity index 81%
rename from lib/ui/screens/skeleton_screen.dart
rename to lib/ui/skeleton.dart
index a08274b..e8493f1 100644
--- a/lib/ui/screens/skeleton_screen.dart
+++ b/lib/ui/skeleton.dart
@@ -1,16 +1,14 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../cubit/bottom_nav_cubit.dart';
-import '../../cubit/settings_cubit.dart';
-
-import '../widgets/app_bar.dart';
-import '../widgets/bottom_nav_bar.dart';
-
-import 'demo_page.dart';
-import 'graph_page.dart';
-import 'about_page.dart';
-import 'settings_page.dart';
+import 'package:random/cubit/bottom_nav_cubit.dart';
+import 'package:random/cubit/settings_cubit.dart';
+import 'package:random/ui/screens/about_page.dart';
+import 'package:random/ui/screens/demo_page.dart';
+import 'package:random/ui/screens/graph_page.dart';
+import 'package:random/ui/screens/settings_page.dart';
+import 'package:random/ui/widgets/app_bar.dart';
+import 'package:random/ui/widgets/bottom_nav_bar.dart';
class SkeletonScreen extends StatefulWidget {
const SkeletonScreen({super.key});
diff --git a/lib/ui/widgets/app_bar.dart b/lib/ui/widgets/app_bar.dart
index 32cbde9..ea07b61 100644
--- a/lib/ui/widgets/app_bar.dart
+++ b/lib/ui/widgets/app_bar.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:unicons/unicons.dart';
-import '../widgets/header.dart';
+import 'package:random/ui/widgets/header_app.dart';
class StandardAppBar extends StatelessWidget implements PreferredSizeWidget {
const StandardAppBar({super.key});
@@ -9,7 +9,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: () {},
diff --git a/lib/ui/widgets/bottom_nav_bar.dart b/lib/ui/widgets/bottom_nav_bar.dart
index 88dd014..f0ec9f4 100644
--- a/lib/ui/widgets/bottom_nav_bar.dart
+++ b/lib/ui/widgets/bottom_nav_bar.dart
@@ -1,9 +1,9 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ionicons/ionicons.dart';
+import 'package:unicons/unicons.dart';
-import '../../cubit/bottom_nav_cubit.dart';
+import 'package:random/cubit/bottom_nav_cubit.dart';
class BottomNavBar extends StatelessWidget {
const BottomNavBar({super.key});
@@ -33,19 +33,19 @@ class BottomNavBar extends StatelessWidget {
unselectedItemColor: Theme.of(context).textTheme.bodySmall!.color,
items: <BottomNavigationBarItem>[
BottomNavigationBarItem(
- icon: const Icon(Ionicons.image_outline),
+ icon: const Icon(UniconsLine.image),
label: tr('bottom_nav_sample'),
),
BottomNavigationBarItem(
- icon: const Icon(Ionicons.pencil_outline),
+ icon: const Icon(UniconsLine.pen),
label: tr('bottom_nav_chart'),
),
BottomNavigationBarItem(
- icon: const Icon(Ionicons.settings_outline),
+ icon: const Icon(UniconsLine.setting),
label: tr('bottom_nav_settings'),
),
BottomNavigationBarItem(
- icon: const Icon(Ionicons.information_circle),
+ icon: const Icon(UniconsLine.info_circle),
label: tr('bottom_nav_about'),
),
],
diff --git a/lib/ui/widgets/header.dart b/lib/ui/widgets/header_app.dart
similarity index 78%
rename from lib/ui/widgets/header.dart
rename to lib/ui/widgets/header_app.dart
index 2187ef8..77b015b 100644
--- a/lib/ui/widgets/header.dart
+++ b/lib/ui/widgets/header_app.dart
@@ -1,8 +1,8 @@
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;
diff --git a/lib/ui/widgets/settings_form.dart b/lib/ui/widgets/settings_form.dart
index 9a8bc83..e0a6e85 100644
--- a/lib/ui/widgets/settings_form.dart
+++ b/lib/ui/widgets/settings_form.dart
@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:unicons/unicons.dart';
-import '../../cubit/bottom_nav_cubit.dart';
-import '../../cubit/settings_cubit.dart';
+import 'package:random/cubit/bottom_nav_cubit.dart';
+import 'package:random/cubit/settings_cubit.dart';
class SettingsForm extends StatefulWidget {
const SettingsForm({super.key});
diff --git a/pubspec.lock b/pubspec.lock
index d2e9184..287e966 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -160,14 +160,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.18.1"
- ionicons:
- dependency: "direct main"
- description:
- name: ionicons
- sha256: "5496bc65a16115ecf05b15b78f494ee4a8869504357668f0a11d689e970523cf"
- url: "https://pub.dev"
- source: hosted
- version: "0.2.2"
material_color_utilities:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b7888b6..f98000d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A random application, for testing purpose only.
publish_to: 'none'
-version: 1.0.30+31
+version: 1.0.31+32
environment:
sdk: '^3.0.0'
@@ -17,7 +17,6 @@ dependencies:
flutter_bloc: ^8.1.1
path_provider: ^2.0.11
hydrated_bloc: ^9.0.0
- ionicons: ^0.2.2
unicons: ^2.1.1
package_info_plus: ^4.2.0
--
GitLab