From 02059e94fdea198ecb3601ae5bbd25f9c964e69c Mon Sep 17 00:00:00 2001 From: venbaittech Date: Thu, 10 Apr 2025 16:39:10 +0530 Subject: [PATCH 1/2] bar chart chnages --- android/app/build.gradle | 4 +-- .../Screens/charts/widgets/chart_widget.dart | 32 ++++++++++++++++--- pubspec.yaml | 2 +- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 2c6a89ad..ef810cea 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -20,12 +20,12 @@ if (project.hasProperty('google-services.json')) { def flutterVersionCode = localProperties.getProperty("flutter.versionCode") if (flutterVersionCode == null) { - flutterVersionCode = "48" + flutterVersionCode = "49" } def flutterVersionName = localProperties.getProperty("flutter.versionName") if (flutterVersionName == null) { - flutterVersionName = "1.0.47" + flutterVersionName = "1.0.48" } def keystorePropertiesFile = rootProject.file("key.properties") diff --git a/lib/presentation/Screens/charts/widgets/chart_widget.dart b/lib/presentation/Screens/charts/widgets/chart_widget.dart index 7190ec6c..7e558f89 100644 --- a/lib/presentation/Screens/charts/widgets/chart_widget.dart +++ b/lib/presentation/Screens/charts/widgets/chart_widget.dart @@ -1616,7 +1616,7 @@ class ChartWidget extends StatelessWidget { return SingleChildScrollView( scrollDirection: Axis.horizontal, - physics: xAxisData.length < 7 + physics: xAxisData.length > 4 ? const NeverScrollableScrollPhysics() // Disable scrolling : const AlwaysScrollableScrollPhysics(), // Enable scrolling padding: const EdgeInsets.only(top: 10, left: 5), @@ -1680,7 +1680,19 @@ class ChartWidget extends StatelessWidget { // String unitMsrLabel = yAxisLabels.isNotEmpty && groupIndex < yAxisLabels.length // ? yAxisLabels[groupIndex] // : ''; - if (rod.toY == 0) return null; + // if (rod.toY == 0) return null; + + if (rod.toY == 0) { + return BarTooltipItem( + '0', // Display "0" instead of hiding + + const TextStyle( + color: Colors.black, + fontSize: 12, + fontWeight: FontWeight.w400, + ), + ); + } return BarTooltipItem( (chartConversion != null && @@ -1830,7 +1842,18 @@ class ChartWidget extends StatelessWidget { barsSpace: 10, barRods: [ BarChartRodData( - toY: yAxisData[index], + // toY: yAxisData[index], + toY: yAxisData[index] == 0 + ? 0.1 + : yAxisData[index], + // toY: yAxisData[index] == 0 + // ? 0.001 + // : yAxisData[ + // index], // gives a slight visible bar + + // color: yAxisData[index] == 0 + // ? Colors.grey + // : bodyColor, color: bodyColor, borderRadius: BorderRadius.circular(4), width: 20, @@ -1938,7 +1961,7 @@ class ChartWidget extends StatelessWidget { tooltipMargin: 12, getTooltipColor: (group) => Colors.transparent, getTooltipItem: (group, groupIndex, rod, rodIndex) { - if (rod.toY == 0) return null; + // if (rod.toY == 0) return null; return BarTooltipItem( // formatNumber(rod.toY), @@ -3705,6 +3728,7 @@ class ChartWidget extends StatelessWidget { return BarChartRodData( // toY: value, + toY: value == 0 ? minBarHeight : value, // Use the parsed value color: barColor, // Dynamic color width: 20, diff --git a/pubspec.yaml b/pubspec.yaml index d2f04add..a1a71148 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: uae_stat description: "View statistics about the UAE from the Federal Center for Statistics and Competitiveness." publish_to: "none" -version: 1.0.47+48 +version: 1.0.48+49 environment: sdk: ">=3.2.3 <4.0.0" From 1bde063cc148ab59e68ceb0b41cdcd8a069cedad Mon Sep 17 00:00:00 2001 From: Venba Team Date: Thu, 10 Apr 2025 18:13:07 +0530 Subject: [PATCH 2/2] file --- .gitignore | 2 + ios/Podfile | 2 +- ios/Podfile.lock | 161 +++++++++++++++++++++++++++++----- ios/Runner/Info-Debug.plist | 73 +++++++++++++++ ios/Runner/Info-Release.plist | 73 +++++++++++++++ ios/Runner/Info1.plist | 73 +++++++++++++++ 6 files changed, 362 insertions(+), 22 deletions(-) create mode 100644 ios/Runner/Info-Debug.plist create mode 100644 ios/Runner/Info-Release.plist create mode 100644 ios/Runner/Info1.plist diff --git a/.gitignore b/.gitignore index 29a3a501..79c113f9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related diff --git a/ios/Podfile b/ios/Podfile index 164df534..3e44f9c6 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '12.0' +platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 79a8ef94..cede3152 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,74 +1,193 @@ PODS: + - app_links (0.0.2): + - Flutter + - connectivity_plus (0.0.1): + - Flutter + - Firebase/CoreOnly (11.8.0): + - FirebaseCore (~> 11.8.0) + - Firebase/Messaging (11.8.0): + - Firebase/CoreOnly + - FirebaseMessaging (~> 11.8.0) + - firebase_core (3.12.1): + - Firebase/CoreOnly (= 11.8.0) + - Flutter + - firebase_messaging (15.2.4): + - Firebase/Messaging (= 11.8.0) + - firebase_core + - Flutter + - FirebaseCore (11.8.1): + - FirebaseCoreInternal (~> 11.8.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/Logger (~> 8.0) + - FirebaseCoreInternal (11.8.0): + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - FirebaseInstallations (11.8.0): + - FirebaseCore (~> 11.8.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - PromisesObjC (~> 2.4) + - FirebaseMessaging (11.8.0): + - FirebaseCore (~> 11.8.0) + - FirebaseInstallations (~> 11.0) + - GoogleDataTransport (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/Reachability (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - nanopb (~> 3.30910.0) - Flutter (1.0.0) - - flutter_native_splash (0.0.1): + - flutter_native_splash (2.4.3): - Flutter - - flutter_secure_storage (6.0.0): + - flutter_secure_storage_darwin (10.0.0): - Flutter + - FlutterMacOS - fluttertoast (0.0.2): - Flutter - - Toast + - GoogleDataTransport (10.1.0): + - nanopb (~> 3.30910.0) + - PromisesObjC (~> 2.4) + - GoogleUtilities/AppDelegateSwizzler (8.0.2): + - GoogleUtilities/Environment + - GoogleUtilities/Logger + - GoogleUtilities/Network + - GoogleUtilities/Privacy + - GoogleUtilities/Environment (8.0.2): + - GoogleUtilities/Privacy + - GoogleUtilities/Logger (8.0.2): + - GoogleUtilities/Environment + - GoogleUtilities/Privacy + - GoogleUtilities/Network (8.0.2): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Privacy + - GoogleUtilities/Reachability + - "GoogleUtilities/NSData+zlib (8.0.2)": + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (8.0.2) + - GoogleUtilities/Reachability (8.0.2): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy + - GoogleUtilities/UserDefaults (8.0.2): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy + - image_picker_ios (0.0.1): + - Flutter + - nanopb (3.30910.0): + - nanopb/decode (= 3.30910.0) + - nanopb/encode (= 3.30910.0) + - nanopb/decode (3.30910.0) + - nanopb/encode (3.30910.0) + - package_info_plus (0.4.5): + - Flutter - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS + - PromisesObjC (2.4.0) - share_plus (0.0.1): - Flutter - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - Toast (4.1.1) + - url_launcher_ios (0.0.1): + - Flutter - video_player_avfoundation (0.0.1): - Flutter - FlutterMacOS - webview_flutter_wkwebview (0.0.1): - Flutter + - FlutterMacOS DEPENDENCIES: + - app_links (from `.symlinks/plugins/app_links/ios`) + - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) + - firebase_core (from `.symlinks/plugins/firebase_core/ios`) + - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) - Flutter (from `Flutter`) - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) + - flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) + - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) + - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - share_plus (from `.symlinks/plugins/share_plus/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) + - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`) - - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) + - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`) SPEC REPOS: trunk: - - Toast + - Firebase + - FirebaseCore + - FirebaseCoreInternal + - FirebaseInstallations + - FirebaseMessaging + - GoogleDataTransport + - GoogleUtilities + - nanopb + - PromisesObjC EXTERNAL SOURCES: + app_links: + :path: ".symlinks/plugins/app_links/ios" + connectivity_plus: + :path: ".symlinks/plugins/connectivity_plus/ios" + firebase_core: + :path: ".symlinks/plugins/firebase_core/ios" + firebase_messaging: + :path: ".symlinks/plugins/firebase_messaging/ios" Flutter: :path: Flutter flutter_native_splash: :path: ".symlinks/plugins/flutter_native_splash/ios" - flutter_secure_storage: - :path: ".symlinks/plugins/flutter_secure_storage/ios" + flutter_secure_storage_darwin: + :path: ".symlinks/plugins/flutter_secure_storage_darwin/darwin" fluttertoast: :path: ".symlinks/plugins/fluttertoast/ios" + image_picker_ios: + :path: ".symlinks/plugins/image_picker_ios/ios" + package_info_plus: + :path: ".symlinks/plugins/package_info_plus/ios" path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" share_plus: :path: ".symlinks/plugins/share_plus/ios" shared_preferences_foundation: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" + url_launcher_ios: + :path: ".symlinks/plugins/url_launcher_ios/ios" video_player_avfoundation: :path: ".symlinks/plugins/video_player_avfoundation/darwin" webview_flutter_wkwebview: - :path: ".symlinks/plugins/webview_flutter_wkwebview/ios" + :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin" SPEC CHECKSUMS: + app_links: 76b66b60cc809390ca1ad69bfd66b998d2387ac7 + connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd + Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf + firebase_core: 8d552814f6c01ccde5d88939fced4ec26f2f5510 + firebase_messaging: 8b96a4f09841c15a16b96973ef5c3dcfc1a064e4 + FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d + FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629 + FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917 + FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778 - flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12 - fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c - path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 - share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad - shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 - Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e - video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 - webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1 + flutter_native_splash: 6cad9122ea0fad137d23137dd14b937f3e90b145 + flutter_secure_storage_darwin: ce237a8775b39723566dc72571190a3769d70468 + fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1 + GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 + GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d + image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a + nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 + package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 + path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a + shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 + url_launcher_ios: 694010445543906933d732453a59da0a173ae33d + video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b + webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2 -PODFILE CHECKSUM: 7be2f5f74864d463a8ad433546ed1de7e0f29aef +PODFILE CHECKSUM: a57f30d18f102dd3ce366b1d62a55ecbef2158e5 -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/ios/Runner/Info-Debug.plist b/ios/Runner/Info-Debug.plist new file mode 100644 index 00000000..dcc28aec --- /dev/null +++ b/ios/Runner/Info-Debug.plist @@ -0,0 +1,73 @@ + + + + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + ITSAppUsesNonExemptEncryption + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + UAE Stats + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + uae_stat + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UIApplicationSupportsIndirectInputEvents + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + CFBundleURLTypes + + + CFBundleURLSchemes + + https + + CFBundleURLName + fcsc-da580.web.app + + + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + FirebaseDynamicLinksCustomDomains + + https://fcsc-a161c.web.app + + UIStatusBarHidden + + + diff --git a/ios/Runner/Info-Release.plist b/ios/Runner/Info-Release.plist new file mode 100644 index 00000000..dcc28aec --- /dev/null +++ b/ios/Runner/Info-Release.plist @@ -0,0 +1,73 @@ + + + + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + ITSAppUsesNonExemptEncryption + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + UAE Stats + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + uae_stat + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UIApplicationSupportsIndirectInputEvents + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + CFBundleURLTypes + + + CFBundleURLSchemes + + https + + CFBundleURLName + fcsc-da580.web.app + + + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + FirebaseDynamicLinksCustomDomains + + https://fcsc-a161c.web.app + + UIStatusBarHidden + + + diff --git a/ios/Runner/Info1.plist b/ios/Runner/Info1.plist new file mode 100644 index 00000000..dcc28aec --- /dev/null +++ b/ios/Runner/Info1.plist @@ -0,0 +1,73 @@ + + + + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + ITSAppUsesNonExemptEncryption + + CADisableMinimumFrameDurationOnPhone + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + UAE Stats + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + uae_stat + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UIApplicationSupportsIndirectInputEvents + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + CFBundleURLTypes + + + CFBundleURLSchemes + + https + + CFBundleURLName + fcsc-da580.web.app + + + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + FirebaseDynamicLinksCustomDomains + + https://fcsc-a161c.web.app + + UIStatusBarHidden + + +