Skip to content

Commit d9eb47b

Browse files
Pavel401Pavel401
authored
Merge pull request #331 from 0xharkirat/fix/filter-drawer-ui
fix: filter drawer ui
2 parents fc00830 + 05d7e72 commit d9eb47b

File tree

10 files changed

+135
-58
lines changed

10 files changed

+135
-58
lines changed

‎ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

‎ios/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '11.0'
2+
# platform :ios, '12.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎ios/Podfile.lock‎

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,40 @@ PODS:
22
- connectivity_plus (0.0.1):
33
- Flutter
44
- ReachabilitySwift
5+
- DKImagePickerController/Core (4.3.4):
6+
- DKImagePickerController/ImageDataManager
7+
- DKImagePickerController/Resource
8+
- DKImagePickerController/ImageDataManager (4.3.4)
9+
- DKImagePickerController/PhotoGallery (4.3.4):
10+
- DKImagePickerController/Core
11+
- DKPhotoGallery
12+
- DKImagePickerController/Resource (4.3.4)
13+
- DKPhotoGallery (0.0.17):
14+
- DKPhotoGallery/Core (= 0.0.17)
15+
- DKPhotoGallery/Model (= 0.0.17)
16+
- DKPhotoGallery/Preview (= 0.0.17)
17+
- DKPhotoGallery/Resource (= 0.0.17)
18+
- SDWebImage
19+
- SwiftyGif
20+
- DKPhotoGallery/Core (0.0.17):
21+
- DKPhotoGallery/Model
22+
- DKPhotoGallery/Preview
23+
- SDWebImage
24+
- SwiftyGif
25+
- DKPhotoGallery/Model (0.0.17):
26+
- SDWebImage
27+
- SwiftyGif
28+
- DKPhotoGallery/Preview (0.0.17):
29+
- DKPhotoGallery/Model
30+
- DKPhotoGallery/Resource
31+
- SDWebImage
32+
- SwiftyGif
33+
- DKPhotoGallery/Resource (0.0.17):
34+
- SDWebImage
35+
- SwiftyGif
36+
- file_picker (0.0.1):
37+
- DKImagePickerController/PhotoGallery
38+
- Flutter
539
- file_picker_writable (0.0.1):
640
- Flutter
741
- file_selector_ios (0.0.1):
@@ -23,14 +57,19 @@ PODS:
2357
- permission_handler_apple (9.1.1):
2458
- Flutter
2559
- ReachabilitySwift (5.0.0)
60+
- SDWebImage (5.19.0):
61+
- SDWebImage/Core (= 5.19.0)
62+
- SDWebImage/Core (5.19.0)
2663
- shared_preferences_foundation (0.0.1):
2764
- Flutter
2865
- FlutterMacOS
66+
- SwiftyGif (5.4.4)
2967
- url_launcher_ios (0.0.1):
3068
- Flutter
3169

3270
DEPENDENCIES:
3371
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
72+
- file_picker (from `.symlinks/plugins/file_picker/ios`)
3473
- file_picker_writable (from `.symlinks/plugins/file_picker_writable/ios`)
3574
- file_selector_ios (from `.symlinks/plugins/file_selector_ios/ios`)
3675
- Flutter (from `Flutter`)
@@ -46,11 +85,17 @@ DEPENDENCIES:
4685

4786
SPEC REPOS:
4887
trunk:
88+
- DKImagePickerController
89+
- DKPhotoGallery
4990
- ReachabilitySwift
91+
- SDWebImage
92+
- SwiftyGif
5093

5194
EXTERNAL SOURCES:
5295
connectivity_plus:
5396
:path: ".symlinks/plugins/connectivity_plus/ios"
97+
file_picker:
98+
:path: ".symlinks/plugins/file_picker/ios"
5499
file_picker_writable:
55100
:path: ".symlinks/plugins/file_picker_writable/ios"
56101
file_selector_ios:
@@ -78,9 +123,12 @@ EXTERNAL SOURCES:
78123

79124
SPEC CHECKSUMS:
80125
connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
126+
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
127+
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
128+
file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
81129
file_picker_writable: 67959f5c516feb5121693a14eda63fcbe6cbb6dc
82130
file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b
83-
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
131+
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
84132
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
85133
flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
86134
flutter_native_timezone: 5f05b2de06c9776b4cc70e1839f03de178394d22
@@ -89,9 +137,11 @@ SPEC CHECKSUMS:
89137
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
90138
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
91139
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
140+
SDWebImage: 981fd7e860af070920f249fd092420006014c3eb
92141
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
93-
url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
142+
SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
143+
url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
94144

95-
PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
145+
PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
96146

97-
COCOAPODS: 1.14.3
147+
COCOAPODS: 1.15.2

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
97C146E61CF9000F007C117D /* Project object */ = {
157157
isa = PBXProject;
158158
attributes = {
159-
LastUpgradeCheck = 1430;
159+
LastUpgradeCheck = 1510;
160160
ORGANIZATIONNAME = "";
161161
TargetAttributes = {
162162
97C146ED1CF9000F007C117D = {
@@ -343,7 +343,7 @@
343343
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
344344
GCC_WARN_UNUSED_FUNCTION = YES;
345345
GCC_WARN_UNUSED_VARIABLE = YES;
346-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
346+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
347347
MTL_ENABLE_DEBUG_INFO = NO;
348348
SDKROOT = iphoneos;
349349
SUPPORTED_PLATFORMS = iphoneos;
@@ -420,7 +420,7 @@
420420
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
421421
GCC_WARN_UNUSED_FUNCTION = YES;
422422
GCC_WARN_UNUSED_VARIABLE = YES;
423-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
423+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
424424
MTL_ENABLE_DEBUG_INFO = YES;
425425
ONLY_ACTIVE_ARCH = YES;
426426
SDKROOT = iphoneos;
@@ -469,7 +469,7 @@
469469
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
470470
GCC_WARN_UNUSED_FUNCTION = YES;
471471
GCC_WARN_UNUSED_VARIABLE = YES;
472-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
472+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
473473
MTL_ENABLE_DEBUG_INFO = NO;
474474
SDKROOT = iphoneos;
475475
SUPPORTED_PLATFORMS = iphoneos;

‎ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎lib/drawer/filter_drawer.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ class _FilterDrawerState extends State<FilterDrawer> {
198198
),
199199
child: Column(
200200
mainAxisAlignment: MainAxisAlignment.center,
201+
crossAxisAlignment: CrossAxisAlignment.stretch,
201202
children: [
202203
const Divider(
203204
color: Color.fromARGB(0, 48, 46, 46),
@@ -242,6 +243,7 @@ class _FilterDrawerState extends State<FilterDrawer> {
242243
),
243244
//height: 30,
244245
child: Column(
246+
crossAxisAlignment: CrossAxisAlignment.stretch,
245247
children: [
246248
const Divider(
247249
color: Color.fromARGB(0, 48, 46, 46),

‎lib/widgets/project_filter.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class ProjectsColumn extends StatelessWidget {
9393
Padding(
9494
padding: const EdgeInsets.only(left: 10, right: 10, top: 10),
9595
child: Row(
96-
mainAxisAlignment: MainAxisAlignment.center,
96+
mainAxisAlignment: MainAxisAlignment.start,
9797
children: [
9898
Text(
9999
"All Projects",

‎macos/Flutter/GeneratedPluginRegistrant.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import flutter_local_notifications
1212
import flutter_native_timezone
1313
import package_info_plus
1414
import path_provider_foundation
15-
import permission_handler_apple
1615
import shared_preferences_foundation
1716
import url_launcher_macos
1817

@@ -24,7 +23,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
2423
FlutterNativeTimezonePlugin.register(with: registry.registrar(forPlugin: "FlutterNativeTimezonePlugin"))
2524
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
2625
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
27-
PermissionHandlerPlugin.register(with: registry.registrar(forPlugin: "PermissionHandlerPlugin"))
2826
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
2927
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
3028
}

‎pubspec.lock‎

Lines changed: 65 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,30 @@ packages:
624624
url: "https://pub.dev"
625625
source: hosted
626626
version: "4.8.1"
627+
leak_tracker:
628+
dependency: transitive
629+
description:
630+
name: leak_tracker
631+
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
632+
url: "https://pub.dev"
633+
source: hosted
634+
version: "10.0.0"
635+
leak_tracker_flutter_testing:
636+
dependency: transitive
637+
description:
638+
name: leak_tracker_flutter_testing
639+
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
640+
url: "https://pub.dev"
641+
source: hosted
642+
version: "2.0.1"
643+
leak_tracker_testing:
644+
dependency: transitive
645+
description:
646+
name: leak_tracker_testing
647+
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
648+
url: "https://pub.dev"
649+
source: hosted
650+
version: "2.0.1"
627651
lints:
628652
dependency: transitive
629653
description:
@@ -652,26 +676,26 @@ packages:
652676
dependency: transitive
653677
description:
654678
name: matcher
655-
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
679+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
656680
url: "https://pub.dev"
657681
source: hosted
658-
version: "0.12.16"
682+
version: "0.12.16+1"
659683
material_color_utilities:
660684
dependency: transitive
661685
description:
662686
name: material_color_utilities
663-
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
687+
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
664688
url: "https://pub.dev"
665689
source: hosted
666-
version: "0.5.0"
690+
version: "0.8.0"
667691
meta:
668692
dependency: transitive
669693
description:
670694
name: meta
671-
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
695+
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
672696
url: "https://pub.dev"
673697
source: hosted
674-
version: "1.10.0"
698+
version: "1.11.0"
675699
mime:
676700
dependency: transitive
677701
description:
@@ -716,10 +740,10 @@ packages:
716740
dependency: transitive
717741
description:
718742
name: path
719-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
743+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
720744
url: "https://pub.dev"
721745
source: hosted
722-
version: "1.8.3"
746+
version: "1.9.0"
723747
path_parsing:
724748
dependency: transitive
725749
description:
@@ -787,48 +811,43 @@ packages:
787811
permission_handler:
788812
dependency: "direct main"
789813
description:
790-
path: permission_handler
791-
ref: master
792-
resolved-ref: "5f9cd3a698dd64975f68a36c581a1097bc47563c"
793-
url: "https://github.com/bvoq/flutter-permission-handler.git"
794-
source: git
795-
version: "10.2.0"
814+
name: permission_handler
815+
sha256: bc56bfe9d3f44c3c612d8d393bd9b174eb796d706759f9b495ac254e4294baa5
816+
url: "https://pub.dev"
817+
source: hosted
818+
version: "10.4.5"
796819
permission_handler_android:
797820
dependency: transitive
798821
description:
799-
path: permission_handler_android
800-
ref: master
801-
resolved-ref: "5f9cd3a698dd64975f68a36c581a1097bc47563c"
802-
url: "https://github.com/bvoq/flutter-permission-handler.git"
803-
source: git
804-
version: "10.2.0"
822+
name: permission_handler_android
823+
sha256: "59c6322171c29df93a22d150ad95f3aa19ed86542eaec409ab2691b8f35f9a47"
824+
url: "https://pub.dev"
825+
source: hosted
826+
version: "10.3.6"
805827
permission_handler_apple:
806828
dependency: transitive
807829
description:
808-
path: permission_handler_apple
809-
ref: master
810-
resolved-ref: "5f9cd3a698dd64975f68a36c581a1097bc47563c"
811-
url: "https://github.com/bvoq/flutter-permission-handler.git"
812-
source: git
813-
version: "9.0.7"
830+
name: permission_handler_apple
831+
sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5"
832+
url: "https://pub.dev"
833+
source: hosted
834+
version: "9.1.4"
814835
permission_handler_platform_interface:
815836
dependency: transitive
816837
description:
817-
path: permission_handler_platform_interface
818-
ref: master
819-
resolved-ref: "5f9cd3a698dd64975f68a36c581a1097bc47563c"
820-
url: "https://github.com/bvoq/flutter-permission-handler.git"
821-
source: git
822-
version: "3.9.0"
838+
name: permission_handler_platform_interface
839+
sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4"
840+
url: "https://pub.dev"
841+
source: hosted
842+
version: "3.12.0"
823843
permission_handler_windows:
824844
dependency: transitive
825845
description:
826-
path: permission_handler_windows
827-
ref: master
828-
resolved-ref: "5f9cd3a698dd64975f68a36c581a1097bc47563c"
829-
url: "https://github.com/bvoq/flutter-permission-handler.git"
830-
source: git
831-
version: "0.1.2"
846+
name: permission_handler_windows
847+
sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098
848+
url: "https://pub.dev"
849+
source: hosted
850+
version: "0.1.3"
832851
petitparser:
833852
dependency: transitive
834853
description:
@@ -1242,6 +1261,14 @@ packages:
12421261
url: "https://pub.dev"
12431262
source: hosted
12441263
version: "2.1.4"
1264+
vm_service:
1265+
dependency: transitive
1266+
description:
1267+
name: vm_service
1268+
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
1269+
url: "https://pub.dev"
1270+
source: hosted
1271+
version: "13.0.0"
12451272
watcher:
12461273
dependency: transitive
12471274
description:

‎pubspec.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ dependencies:
3838
loggy: ^2.0.1+1
3939
package_info_plus: ^4.0.2
4040
pem: ^2.0.1
41-
# permission_handler: ^10.2.0
42-
permission_handler:
43-
git:
44-
url: https://github.com/bvoq/flutter-permission-handler.git
45-
path: permission_handler
46-
ref: master
41+
permission_handler: ^10.2.0
42+
# permission_handler:
43+
# git:
44+
# url: https://github.com/bvoq/flutter-permission-handler.git
45+
# path: permission_handler
46+
# ref: master
4747
shared_preferences: ^2.2.2
4848
shared_preferences_web: ^2.0.3
4949
sizer: ^2.0.15

0 commit comments

Comments
 (0)