diff --git a/android/Gemfile.lock b/android/Gemfile.lock
index 64cf439..9f41167 100644
--- a/android/Gemfile.lock
+++ b/android/Gemfile.lock
@@ -66,7 +66,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
- fastlane (2.210.1)
+ fastlane (2.214.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
@@ -90,7 +90,7 @@ GEM
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
- multipart-post (~> 2.0.0)
+ multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (~> 0.1.1)
plist (>= 3.1.0, < 4.0.0)
@@ -168,7 +168,8 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
- rexml (3.2.5)
+ rexml (3.3.3)
+ strscan
rouge (2.0.7)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
@@ -181,6 +182,7 @@ GEM
simctl (1.6.8)
CFPropertyList
naturally
+ strscan (3.1.0)
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
@@ -196,13 +198,12 @@ GEM
unicode-display_width (1.8.0)
webrick (1.7.0)
word_wrap (1.0.0)
- xcodeproj (1.22.0)
+ xcodeproj (1.19.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
- rexml (~> 3.2.4)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 9625e10..7c56964 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
CFBundleVersion
1.0
MinimumOSVersion
- 11.0
+ 12.0
diff --git a/ios/Podfile b/ios/Podfile
index 88359b2..279576f 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '12.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index c6950e2..3742284 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -156,7 +156,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 1300;
+ LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
@@ -343,7 +343,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -420,7 +420,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -469,7 +469,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index c87d15a..5e31d3d 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
{
}
List _skeletonLoader() {
- final defaultSkeletonTile = SkeletonListTile(
- leadingStyle: const SkeletonAvatarStyle(
- shape: BoxShape.circle,
+ final defaultSkeletonTile = Skeletonizer(
+ effect: const ShimmerEffect(
+ baseColor: Color.fromARGB(255, 196, 179, 23),
+ highlightColor: Colors.white,
+ duration: Duration(seconds: 1),
),
- titleStyle: const SkeletonLineStyle(
- width: 180,
- ),
- subtitleStyle: const SkeletonLineStyle(
- width: 100,
- ),
- hasSubtitle: true,
- padding: const EdgeInsets.symmetric(
- horizontal: 20,
- vertical: 8,
+ child: DomainSpecificInfo(
+ icon: const Icon(Icons.work_outlined, size: 35),
+ title: "Placeholder",
+ subtitle: "This is a placeholder for skeleton loader",
),
);
return [
diff --git a/lib/page/search_domaine_page.dart b/lib/page/search_domaine_page.dart
index 46717dd..b5211e6 100644
--- a/lib/page/search_domaine_page.dart
+++ b/lib/page/search_domaine_page.dart
@@ -6,7 +6,7 @@ import 'package:domaine_nc_mobile/service/domaine_service.dart';
import 'package:domaine_nc_mobile/utils/error_utils.dart';
import 'package:domaine_nc_mobile/widget/search_bar_domaine.dart';
import 'package:flutter/material.dart';
-import 'package:skeletons/skeletons.dart';
+import 'package:skeletonizer/skeletonizer.dart';
class SearchDomainPage extends StatefulWidget {
const SearchDomainPage({super.key});
@@ -135,30 +135,50 @@ class _SearchDomainPageState extends State {
return Padding(
padding: const EdgeInsets.only(top: 20),
child: Text(
- _searchController.value.text.isEmpty ? "" : "Aucun Résultat",
+ "Aucun Résultat",
),
);
}
}
Widget _skeletonLoader() {
- return Padding(
- padding: const EdgeInsets.only(top: 18, left: 8),
- child: SkeletonListView(
- item: SkeletonListTile(
- hasLeading: true,
- hasSubtitle: true,
- titleStyle: const SkeletonLineStyle(
- maxLength: 200,
- minLength: 100,
- randomLength: true,
- ),
- subtitleStyle: const SkeletonLineStyle(
- width: 100,
- ),
- leadingStyle: const SkeletonAvatarStyle(
- shape: BoxShape.circle,
- width: 44,
+ return Skeletonizer(
+ effect: const ShimmerEffect(
+ baseColor: Color.fromARGB(255, 196, 179, 23),
+ highlightColor: Colors.white,
+ duration: Duration(seconds: 1),
+ ),
+ child: Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 10),
+ child: SizedBox(
+ height: 10.0,
+ child: ListView.builder(
+ itemCount: 10,
+ shrinkWrap: true,
+ padding: const EdgeInsets.symmetric(vertical: 10),
+ itemBuilder: (context, index) {
+ return ListTile(
+ leading: const Icon(
+ Icons.public,
+ size: 40,
+ ),
+ title: Padding(
+ padding: const EdgeInsets.only(bottom: 5.0),
+ child: Text(
+ "Placeholder.nc",
+ style: const TextStyle(
+ fontSize: 20,
+ ),
+ ),
+ ),
+ subtitle: Padding(
+ padding: const EdgeInsets.only(left: 5.0),
+ child: Text(
+ "This is a placeholder for domain",
+ ),
+ ),
+ );
+ },
),
),
),
diff --git a/lib/theme/dark_theme.dart b/lib/theme/dark_theme.dart
index 29765ff..dffed46 100644
--- a/lib/theme/dark_theme.dart
+++ b/lib/theme/dark_theme.dart
@@ -31,8 +31,6 @@ class DarkThemeDataApp {
secondary: DarkThemeDataApp.secondaryColor,
error: DarkThemeDataApp.errorColor,
onError: DarkThemeDataApp.mainColor,
- background: DarkThemeDataApp.backgroundColor,
- onBackground: DarkThemeDataApp.backgroundColor,
onSurface: DarkThemeDataApp.backgroundColor,
surface: DarkThemeDataApp.backgroundColor,
),
diff --git a/pubspec.lock b/pubspec.lock
index cf67001..cbcbac8 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -29,10 +29,10 @@ packages:
dependency: transitive
description:
name: async
- sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+ sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
url: "https://pub.dev"
source: hosted
- version: "2.10.0"
+ version: "2.11.0"
boolean_selector:
dependency: transitive
description:
@@ -45,10 +45,10 @@ packages:
dependency: transitive
description:
name: characters
- sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+ sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev"
source: hosted
- version: "1.2.1"
+ version: "1.3.0"
checked_yaml:
dependency: transitive
description:
@@ -77,10 +77,10 @@ packages:
dependency: transitive
description:
name: collection
- sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+ sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev"
source: hosted
- version: "1.17.0"
+ version: "1.18.0"
convert:
dependency: transitive
description:
@@ -200,6 +200,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.8.0"
+ leak_tracker:
+ dependency: transitive
+ description:
+ name: leak_tracker
+ sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+ url: "https://pub.dev"
+ source: hosted
+ version: "10.0.4"
+ leak_tracker_flutter_testing:
+ dependency: transitive
+ description:
+ name: leak_tracker_flutter_testing
+ sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.3"
+ leak_tracker_testing:
+ dependency: transitive
+ description:
+ name: leak_tracker_testing
+ sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.1"
lints:
dependency: transitive
description:
@@ -220,34 +244,34 @@ packages:
dependency: transitive
description:
name: matcher
- sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+ sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
- version: "0.12.13"
+ version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
- sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+ sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
- version: "0.2.0"
+ version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
- sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+ sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
- version: "1.8.0"
+ version: "1.12.0"
path:
dependency: transitive
description:
name: path
- sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+ sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
- version: "1.8.2"
+ version: "1.9.0"
petitparser:
dependency: transitive
description:
@@ -272,14 +296,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.6.2"
- skeletons:
+ skeletonizer:
dependency: "direct main"
description:
- name: skeletons
- sha256: "5b2d08ae7f908ee1f7007ca99f8dcebb4bfc1d3cb2143dec8d112a5be5a45c8f"
+ name: skeletonizer
+ sha256: "3b202e4fa9c49b017d368fb0e570d4952bcd19972b67b2face071bdd68abbfae"
url: "https://pub.dev"
source: hosted
- version: "0.0.3"
+ version: "1.4.2"
sky_engine:
dependency: transitive
description: flutter
@@ -289,26 +313,26 @@ packages:
dependency: transitive
description:
name: source_span
- sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+ sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
- version: "1.9.1"
+ version: "1.10.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
- sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+ sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
- version: "1.11.0"
+ version: "1.11.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
- sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+ sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
- version: "2.1.1"
+ version: "2.1.2"
string_scanner:
dependency: transitive
description:
@@ -329,10 +353,10 @@ packages:
dependency: transitive
description:
name: test_api
- sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+ sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev"
source: hosted
- version: "0.4.16"
+ version: "0.7.0"
typed_data:
dependency: transitive
description:
@@ -413,6 +437,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
+ vm_service:
+ dependency: transitive
+ description:
+ name: vm_service
+ sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+ url: "https://pub.dev"
+ source: hosted
+ version: "14.2.1"
xml:
dependency: transitive
description:
@@ -430,5 +462,5 @@ packages:
source: hosted
version: "3.1.1"
sdks:
- dart: ">=3.1.0-185.0.dev <4.0.0"
- flutter: ">=3.3.0"
+ dart: ">=3.3.0 <4.0.0"
+ flutter: ">=3.18.0-18.0.pre.54"
diff --git a/pubspec.yaml b/pubspec.yaml
index 412c3c5..ee0d613 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -35,11 +35,11 @@ dependencies:
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.6
http: ^0.13.6
- skeletons: ^0.0.3
intl: ^0.18.1
add_2_calendar: ^2.2.4
flutter_markdown: ^0.6.15
url_launcher: ^6.1.11
+ skeletonizer: ^1.4.2
dev_dependencies:
flutter_test: