Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump rexml from 3.2.5 to 3.3.3 in /android #196

Merged
merged 3 commits into from
Aug 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
8 changes: 4 additions & 4 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
24 changes: 10 additions & 14 deletions lib/page/domaine_detail_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:domaine_nc_mobile/utils/error_utils.dart';
import 'package:domaine_nc_mobile/widget/domain_specific_info.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:skeletons/skeletons.dart';
import 'package:skeletonizer/skeletonizer.dart';

class DomaineDetailPage extends StatefulWidget {
const DomaineDetailPage({
Expand Down Expand Up @@ -96,20 +96,16 @@ class _DomaineDetailPage extends State<DomaineDetailPage> {
}

List<Widget> _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 [
Expand Down
58 changes: 39 additions & 19 deletions lib/page/search_domaine_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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});
Expand Down Expand Up @@ -135,30 +135,50 @@ class _SearchDomainPageState extends State<SearchDomainPage> {
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",
),
),
);
},
),
),
),
Expand Down
2 changes: 0 additions & 2 deletions lib/theme/dark_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
Loading