diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 3bc42ec5..62dc3542 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2,38 +2,38 @@ PODS: - connectivity_plus (0.0.1): - Flutter - ReachabilitySwift - - Firebase/Analytics (10.0.0): + - Firebase/Analytics (10.3.0): - Firebase/Core - - Firebase/Core (10.0.0): + - Firebase/Core (10.3.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 10.0.0) - - Firebase/CoreOnly (10.0.0): - - FirebaseCore (= 10.0.0) - - Firebase/Messaging (10.0.0): + - FirebaseAnalytics (~> 10.3.0) + - Firebase/CoreOnly (10.3.0): + - FirebaseCore (= 10.3.0) + - Firebase/Messaging (10.3.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.0.0) - - Firebase/RemoteConfig (10.0.0): + - FirebaseMessaging (~> 10.3.0) + - Firebase/RemoteConfig (10.3.0): - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 10.0.0) - - firebase_analytics (10.0.4): - - Firebase/Analytics (= 10.0.0) + - FirebaseRemoteConfig (~> 10.3.0) + - firebase_analytics (10.1.0): + - Firebase/Analytics (= 10.3.0) - firebase_core - Flutter - - firebase_core (2.1.1): - - Firebase/CoreOnly (= 10.0.0) + - firebase_core (2.4.1): + - Firebase/CoreOnly (= 10.3.0) - Flutter - - firebase_messaging (14.0.4): - - Firebase/Messaging (= 10.0.0) + - firebase_messaging (14.2.1): + - Firebase/Messaging (= 10.3.0) - firebase_core - Flutter - - firebase_remote_config (3.0.4): - - Firebase/RemoteConfig (= 10.0.0) + - firebase_remote_config (3.0.9): + - Firebase/RemoteConfig (= 10.3.0) - firebase_core - Flutter - - FirebaseABTesting (10.1.0): + - FirebaseABTesting (10.3.0): - FirebaseCore (~> 10.0) - - FirebaseAnalytics (10.0.0): - - FirebaseAnalytics/AdIdSupport (= 10.0.0) + - FirebaseAnalytics (10.3.0): + - FirebaseAnalytics/AdIdSupport (= 10.3.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.8) @@ -41,27 +41,27 @@ PODS: - GoogleUtilities/Network (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (10.0.0): + - FirebaseAnalytics/AdIdSupport (10.3.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - - GoogleAppMeasurement (= 10.0.0) + - GoogleAppMeasurement (= 10.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - GoogleUtilities/Network (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCore (10.0.0): + - FirebaseCore (10.3.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreInternal (10.1.0): + - FirebaseCoreInternal (10.3.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseInstallations (10.1.0): + - FirebaseInstallations (10.3.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseMessaging (10.0.0): + - FirebaseMessaging (10.3.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleDataTransport (~> 9.2) @@ -70,7 +70,7 @@ PODS: - GoogleUtilities/Reachability (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseRemoteConfig (10.0.0): + - FirebaseRemoteConfig (10.3.0): - FirebaseABTesting (~> 10.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) @@ -89,21 +89,21 @@ PODS: - fluttertoast (0.0.2): - Flutter - Toast - - GoogleAppMeasurement (10.0.0): - - GoogleAppMeasurement/AdIdSupport (= 10.0.0) + - GoogleAppMeasurement (10.3.0): + - GoogleAppMeasurement/AdIdSupport (= 10.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - GoogleUtilities/Network (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (10.0.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 10.0.0) + - GoogleAppMeasurement/AdIdSupport (10.3.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.3.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - GoogleUtilities/Network (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (10.0.0): + - GoogleAppMeasurement/WithoutAdIdSupport (10.3.0): - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - GoogleUtilities/Network (~> 7.8) @@ -113,24 +113,24 @@ PODS: - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.8.0): + - GoogleUtilities/AppDelegateSwizzler (7.10.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.8.0): + - GoogleUtilities/Environment (7.10.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.8.0): + - GoogleUtilities/Logger (7.10.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.8.0): + - GoogleUtilities/MethodSwizzler (7.10.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.8.0): + - GoogleUtilities/Network (7.10.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.8.0)" - - GoogleUtilities/Reachability (7.8.0): + - "GoogleUtilities/NSData+zlib (7.10.0)" + - GoogleUtilities/Reachability (7.10.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.8.0): + - GoogleUtilities/UserDefaults (7.10.0): - GoogleUtilities/Logger - nanopb (2.30909.0): - nanopb/decode (= 2.30909.0) @@ -144,13 +144,11 @@ PODS: - Flutter - PromisesObjC (2.1.1) - ReachabilitySwift (5.0.0) - - Sentry (7.30.1): - - Sentry/Core (= 7.30.1) - - Sentry/Core (7.30.1) + - Sentry/HybridSDK (7.31.3) - sentry_flutter (0.0.1): - Flutter - FlutterMacOS - - Sentry (~> 7.30.0) + - Sentry/HybridSDK (= 7.31.3) - share_plus (0.0.1): - Flutter - shared_preferences_ios (0.0.1): @@ -230,33 +228,33 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e - Firebase: 1b810f3d0c0532e27a48f1961f8c0400a668a2cf - firebase_analytics: 38790c3205b2ee56b82be7bf0f54c84fc866253f - firebase_core: 5c0bb0ca7d0e70480a68a6e9ad9bf55d1edd5305 - firebase_messaging: bf848602391fa6ee68d86e337f81be14be120aaf - firebase_remote_config: 02b66b55a60acde247bbf92101ae5fecc113df80 - FirebaseABTesting: 8404d743de561c73570c8dbb7810035ffec10053 - FirebaseAnalytics: 9921a52739f4ab66099da31b6e0243db78a3ac0a - FirebaseCore: 97f48a3a567a72b8d4daa0f03c3aadb78df4e995 - FirebaseCoreInternal: 96d75228e10fd369564da51bd898414eb0f54df5 - FirebaseInstallations: 99d24bac0243cf8b0e96cf5426340d211f0bcc80 - FirebaseMessaging: 8916bf5edb1dbfac74665a181e4d1ab3a78a08a2 - FirebaseRemoteConfig: e4431ddba74ddf705e2aabd7d356a23d5b802853 + Firebase: f92fc551ead69c94168d36c2b26188263860acd9 + firebase_analytics: 9f3a4cb560a59976b2c48707abae2d4cb94bcb3a + firebase_core: bf59c32d2e53814f558efa20840c1902fa2fe461 + firebase_messaging: ee597229fc260f8fa491fa8f2d4a32dfbfa406fa + firebase_remote_config: 5007603d4cec2dc1e5016077a7ec36ed93c5041b + FirebaseABTesting: e6660693429b4663573c82f8d2f1041deff1753a + FirebaseAnalytics: 036232b6a1e2918e5f67572417be1173576245f3 + FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a + FirebaseCoreInternal: 29b76f784d607df8b2a1259d73c3f04f1210137b + FirebaseInstallations: e2f26126089dcf41e215f7b8925af8d953c7d602 + FirebaseMessaging: e345b219fd15d325f0cf2fef28cb8ce00d851b3f + FirebaseRemoteConfig: c24f767c17b0440ee63c7e93380d599173556113 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721 flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef - fluttertoast: 74526702fea2c060ea55dde75895b7e1bde1c86b - GoogleAppMeasurement: 7e48a3249792ac35d6f18f107f63f199a7e9d0ce + fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0 + GoogleAppMeasurement: c7d6fff39bf2d829587d74088d582e32d75133c3 GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7 + GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95 nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 - Sentry: 76e08c89f10705f91e347ae91790ca310b256d04 - sentry_flutter: d6f51618010b194d871b063903b1bb8170d396fb + Sentry: 08884c523575ec0f6690d94ed3ccb0246a1600bf + sentry_flutter: 91ebe7757a166b34ff432a0d550d22cd010d44d2 share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 diff --git a/lib/ui/home_view.dart b/lib/ui/home_view.dart index 18f7c581..82f29532 100644 --- a/lib/ui/home_view.dart +++ b/lib/ui/home_view.dart @@ -218,6 +218,7 @@ class _HomeViewState extends State { _model.currentUser?.name ?? '', overflow: TextOverflow.ellipsis, style: TextStyle( + fontSize: 16, color: AppTheme.white, fontWeight: FontWeight.w600, ), @@ -227,6 +228,7 @@ class _HomeViewState extends State { _model.currentUser?.enrNo.toString() ?? '', overflow: TextOverflow.ellipsis, style: TextStyle( + fontSize: 14, color: AppTheme.white, fontWeight: FontWeight.w600, ), @@ -250,6 +252,7 @@ class _HomeViewState extends State { Get.back(); onTap(); }, + behavior: HitTestBehavior.opaque, child: Padding( padding: EdgeInsets.symmetric(horizontal: 10.r, vertical: 15.r), child: Row( @@ -260,7 +263,7 @@ class _HomeViewState extends State { SizedBox(width: 10.r), Text( title, - style: TextStyle(fontSize: 10), + style: TextStyle(fontSize: 12), overflow: TextOverflow.ellipsis, ), ], diff --git a/lib/ui/rebates/my_rebates_view.dart b/lib/ui/rebates/my_rebates_view.dart index e37d6390..71029918 100644 --- a/lib/ui/rebates/my_rebates_view.dart +++ b/lib/ui/rebates/my_rebates_view.dart @@ -7,6 +7,7 @@ import 'package:appetizer/viewmodels/rebates/my_rebates_viewmodel.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:intl/intl.dart'; class MyRebatesView extends StatelessWidget { static const String id = 'rebates_view'; @@ -53,6 +54,8 @@ class MyRebatesView extends StatelessWidget { balanceConsumed: 0, rebate: model.monthlyRebate, additionalMeal: 0, + month: DateFormat.MMMM().format(DateTime.now()), + year: DateTime.now().year, ), _buildRebatesHistoryComponent(), ], diff --git a/pubspec.lock b/pubspec.lock index 9a1795d5..b6259639 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -56,7 +56,7 @@ packages: name: checked_yaml url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" cli_util: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 9050b327..efcba4bf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: appetizer description: An application for digitalzing IIT Roorkee Mess -version: 2.0.3+18 +version: 2.0.4+19 environment: sdk: ">=2.12.0 <3.0.0"