diff --git a/lib/controllers/MenuAppController.dart b/lib/controllers/menu_app_controller.dart similarity index 100% rename from lib/controllers/MenuAppController.dart rename to lib/controllers/menu_app_controller.dart diff --git a/lib/main.dart b/lib/main.dart index ef9f900b..ad6dead9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,5 @@ import 'package:admin/constants.dart'; -import 'package:admin/controllers/MenuAppController.dart'; +import 'package:admin/controllers/menu_app_controller.dart'; import 'package:admin/screens/main/main_screen.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/models/MyFiles.dart b/lib/models/my_files.dart similarity index 96% rename from lib/models/MyFiles.dart rename to lib/models/my_files.dart index b3df1aed..429c7141 100644 --- a/lib/models/MyFiles.dart +++ b/lib/models/my_files.dart @@ -20,7 +20,7 @@ List demoMyFiles = [ CloudStorageInfo( title: "Documents", numOfFiles: 1328, - svgSrc: "assets/icons/Documents.svg", + svgSrc: "assets/icons/documents.svg", totalStorage: "1.9GB", color: primaryColor, percentage: 35, diff --git a/lib/models/RecentFile.dart b/lib/models/recent_file.dart similarity index 96% rename from lib/models/RecentFile.dart rename to lib/models/recent_file.dart index b7b9c799..83ac87c7 100644 --- a/lib/models/RecentFile.dart +++ b/lib/models/recent_file.dart @@ -12,7 +12,7 @@ List demoRecentFiles = [ size: "3.5mb", ), RecentFile( - icon: "assets/icons/Figma_file.svg", + icon: "assets/icons/figma_file.svg", title: "Figma File", date: "27-02-2021", size: "19.0mb", diff --git a/lib/screens/dashboard/components/file_info_card.dart b/lib/screens/dashboard/components/file_info_card.dart index 2cde8e41..87fe6cfa 100644 --- a/lib/screens/dashboard/components/file_info_card.dart +++ b/lib/screens/dashboard/components/file_info_card.dart @@ -1,4 +1,4 @@ -import 'package:admin/models/MyFiles.dart'; +import 'package:admin/models/my_files.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; diff --git a/lib/screens/dashboard/components/header.dart b/lib/screens/dashboard/components/header.dart index afef1688..4042165c 100644 --- a/lib/screens/dashboard/components/header.dart +++ b/lib/screens/dashboard/components/header.dart @@ -1,4 +1,4 @@ -import 'package:admin/controllers/MenuAppController.dart'; +import 'package:admin/controllers/menu_app_controller.dart'; import 'package:admin/responsive.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -96,7 +96,7 @@ class SearchField extends StatelessWidget { color: primaryColor, borderRadius: const BorderRadius.all(Radius.circular(10)), ), - child: SvgPicture.asset("assets/icons/Search.svg"), + child: SvgPicture.asset("assets/icons/search.svg"), ), ), ), diff --git a/lib/screens/dashboard/components/my_fields.dart b/lib/screens/dashboard/components/my_fields.dart index b148abf1..25234c74 100644 --- a/lib/screens/dashboard/components/my_fields.dart +++ b/lib/screens/dashboard/components/my_fields.dart @@ -1,4 +1,4 @@ -import 'package:admin/models/MyFiles.dart'; +import 'package:admin/models/my_files.dart'; import 'package:admin/responsive.dart'; import 'package:flutter/material.dart'; diff --git a/lib/screens/dashboard/components/my_files.dart b/lib/screens/dashboard/components/my_files.dart index 3c9226d6..d1229de4 100644 --- a/lib/screens/dashboard/components/my_files.dart +++ b/lib/screens/dashboard/components/my_files.dart @@ -1,7 +1,6 @@ - import 'package:admin/responsive.dart'; import 'package:flutter/material.dart'; -import 'package:admin/models/MyFiles.dart'; +import 'package:admin/models/my_files.dart'; import '../../../constants.dart'; import 'file_info_card.dart'; diff --git a/lib/screens/dashboard/components/recent_files.dart b/lib/screens/dashboard/components/recent_files.dart index 8870c9fa..f371bcda 100644 --- a/lib/screens/dashboard/components/recent_files.dart +++ b/lib/screens/dashboard/components/recent_files.dart @@ -1,4 +1,4 @@ -import 'package:admin/models/RecentFile.dart'; +import 'package:admin/models/recent_file.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; diff --git a/lib/screens/dashboard/components/storage_details.dart b/lib/screens/dashboard/components/storage_details.dart index 47fb8d3a..67c3859b 100644 --- a/lib/screens/dashboard/components/storage_details.dart +++ b/lib/screens/dashboard/components/storage_details.dart @@ -30,7 +30,7 @@ class StorageDetails extends StatelessWidget { SizedBox(height: defaultPadding), Chart(), StorageInfoCard( - svgSrc: "assets/icons/Documents.svg", + svgSrc: "assets/icons/documents.svg", title: "Documents Files", amountOfFiles: "1.3GB", numOfFiles: 1328, diff --git a/lib/screens/main/main_screen.dart b/lib/screens/main/main_screen.dart index a4b068f7..d67d40c3 100644 --- a/lib/screens/main/main_screen.dart +++ b/lib/screens/main/main_screen.dart @@ -1,4 +1,4 @@ -import 'package:admin/controllers/MenuAppController.dart'; +import 'package:admin/controllers/menu_app_controller.dart'; import 'package:admin/responsive.dart'; import 'package:admin/screens/dashboard/dashboard_screen.dart'; import 'package:flutter/material.dart'; diff --git a/macos/Podfile b/macos/Podfile index dade8dfa..049abe29 100644 --- a/macos/Podfile +++ b/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.11' +platform :osx, '10.14' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 3b0c3807..d2151de6 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -203,7 +203,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 33CC10EC2044A3C60003C045 = { @@ -256,6 +256,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -404,7 +405,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -483,7 +484,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -530,7 +531,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 1ac1f28d..c7903b4e 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@