Merge pull request #236 from atharva-khewle/main

bohot changes kiye. and added announcement screen
TSEC-MAD-Club · Jul 27, 2024 · 63249c8 · 63249c8
2 parents 64c0915 + 3d98131
commit 63249c8
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 44 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -53,18 +53,18 @@ android {
         multiDexEnabled true
     }
 
-    signingConfigs {
+    /*signingConfigs {
         release {
             keyAlias keystoreProperties['keyAlias']
             keyPassword keystoreProperties['keyPassword']
             storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
             storePassword keystoreProperties['storePassword']
         }
-    }
+    }*/
 
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            signingConfig signingConfigs.debug
         }
     }
 }

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.24'
     repositories {
         google()
         jcenter()

diff --git a/lib/new_ui/screens/home_screen/widgets/home_widget.dart b/lib/new_ui/screens/home_screen/widgets/home_widget.dart
@@ -9,11 +9,13 @@ import 'package:go_router/go_router.dart';
 import 'package:tsec_app/models/event_model/event_model.dart';
 import 'package:tsec_app/models/user_model/user_model.dart';
 import 'package:tsec_app/new_ui/colors.dart';
+import 'package:tsec_app/new_ui/screens/AnnouncementScreen/announcementscreen.dart';
 import 'package:tsec_app/new_ui/screens/home_screen/widgets/container_icon_with_label.dart';
 // import 'package:tsec_app/new_ui/screens/home_screen/widgets/expanded_card.dart';
 import 'package:tsec_app/provider/auth_provider.dart';
 import 'package:tsec_app/provider/event_provider.dart';
 import 'package:url_launcher/url_launcher_string.dart';
+import 'package:shimmer_animation/shimmer_animation.dart';
 
 
 import 'package:flutter/material.dart';
@@ -366,7 +368,36 @@ class _HomeWidgetState extends ConsumerState<HomeWidget> {
                   //   ),
                   // ),
 
+                  Container(
+                    margin:EdgeInsets.symmetric(horizontal: 10),
+                    decoration: BoxDecoration(
+                      color: timePickerBg,
+                      borderRadius: BorderRadius.circular(10),
+                      border: Border.all(color: timePickerBorder, width: 1.0), // Change the color and width as needed
+                    ),
+                    child: Shimmer(
+                      duration: Duration(seconds: 2), //Default value
+                      interval: Duration(seconds: 0), //Default value: Duration(seconds: 0)
+                      color: Colors.blue.shade800, //Default value
+
+                      colorOpacity: 0.6, //Default value
+                      enabled: true, //Default value
+                      direction: ShimmerDirection.fromLTRB(),
+                      child: ListTile(
+                        iconColor: Colors.grey.shade400,
+                        contentPadding: EdgeInsets.symmetric(horizontal: 8),
+                        onTap:()=>Navigator.push(context, MaterialPageRoute(builder: (context)=>AnnouncementScreen(),),),
+                        title: Text("Announcement",style: TextStyle(color: Colors.white),),
+                        leading: Icon(Icons.announcement,),
+                        trailing: Icon(Icons.arrow_forward_ios,),
+                      ),
+                    ),
+                  ),
 
+                  SizedBox(
+                    height: 10,
+                  ),
+                  //Welcome Message
                   Container(
                       width: _size.width,
                       child: Padding(

diff --git a/pubspec.lock b/pubspec.lock
@@ -792,30 +792,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.8.0"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.0"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
   linkify:
     dependency: transitive
     description:
@@ -852,26 +828,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.10.0"
   mime:
     dependency: transitive
     description:
@@ -908,10 +884,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.8.3"
   path_provider:
     dependency: "direct main"
     description:
@@ -1136,6 +1112,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  shimmer_animation:
+    dependency: "direct main"
+    description:
+      name: shimmer_animation
+      sha256: "1f12d0f3fc20acbf2dcf8438b79f4268c523d55b2f3de55cf49e5bd3acbc5719"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0+1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -1381,14 +1365,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
-      url: "https://pub.dev"
-    source: hosted
-    version: "13.0.0"
   watcher:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -68,6 +68,7 @@ dependencies:
   flutter_local_notifications: ^17.2.1+1
   #firebase_ui_firestore: ^1.6.3
   bcrypt: ^1.1.3
+  shimmer_animation: ^2.0.0
 
 dev_dependencies:
   build_runner: null