Merge pull request #239 from atharva-khewle/main

some changes ui
TSEC-MAD-Club · Jul 28, 2024 · 3fe6279 · 3fe6279
2 parents 8809d11 + ae2614a
commit 3fe6279
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 35 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -45,11 +45,11 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.madclubtsec.tsec_application"
         minSdkVersion flutter.minSdkVersion
-        targetSdkVersion 33
+        targetSdkVersion 34
         // versionCode flutterVersionCode.toInteger()
         // versionName flutterVersionName
-        versionCode 20 
-        versionName "12.0.0" 
+        versionCode 21
+        versionName "13.0.0"
         multiDexEnabled true
     }
 

diff --git a/lib/new_ui/screens/AnnouncementScreen/announcementscreen.dart b/lib/new_ui/screens/AnnouncementScreen/announcementscreen.dart
@@ -114,37 +114,37 @@ class AnnouncementListItem extends StatelessWidget {
     DateTime endDate = announcementModel.endDate!.toDate();
     return Container(
       margin: EdgeInsets.symmetric(horizontal: 10),
-      decoration: BoxDecoration(
-        color: timePickerBg,
-      ),
+
       child: Card(
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 11.0,vertical: 8),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(announcementModel.title.toString(),style: TextStyle(fontSize: 22,fontWeight: FontWeight.w500),),
-              SizedBox(height: 5),
-              if(announcementModel.content != null)
-                Text(announcementModel.content.toString()),
-              /*Row(
-                children: [
-                  Text("From :- ${getDateString(startDate)}"),
-                  Spacer(),
-                  Text("Till :- ${getDateString(endDate)}"),
-                ],
-              ),*/
-              SizedBox(height: 5),
-              InkWell(splashFactory: NoSplash.splashFactory,onTap: ()=>launchUrl(Uri.parse(announcementModel.docURL.toString(),),),child: Row(
-                children: [
-                  Icon(Icons.link),
-                  SizedBox(
-                    width: 10,
-                  ),
-                  Text("Check out this Link",style: TextStyle(color: Colors.blue,decoration: TextDecoration.underline),),
-                ],
-              ),),
-            ],
+        color: timePickerBg,
+        child: Container(
+          decoration: BoxDecoration(
+          color: timePickerBg,
+            border: Border.all(color: timePickerBorder),
+            borderRadius: BorderRadius.circular(10),
+          ),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 11.0,vertical: 8),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Text(announcementModel.title.toString(),style: TextStyle(fontSize: 22,fontWeight: FontWeight.w500,color: Colors.white),),
+                    if(announcementModel.docURL !=null || announcementModel.docURL !="")
+                    InkWell(splashFactory: NoSplash.splashFactory,onTap: ()=>launchUrl(Uri.parse(announcementModel.docURL.toString(),),)
+                      ,child:Icon(Icons.link,color: Colors.blue,),
+                    ),
+                  ],
+                ),
+                SizedBox(height: 5),
+                if(announcementModel.content != null || announcementModel.content!="")
+                  Text(announcementModel.content.toString(),style: TextStyle(color: Colors.white),),
+                SizedBox(height: 5),
+
+              ],
+            ),
           ),
         ),
       ),

diff --git a/lib/new_ui/screens/main_screen/main_screen.dart b/lib/new_ui/screens/main_screen/main_screen.dart
@@ -841,9 +841,15 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                                 )
                               ]
                           ),
-                        )
+                        ),
+                      ],
+                    ),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Text("App Version : v13.0.0",style: TextStyle(color: Colors.grey.shade700,fontSize: 12 ),),
                       ],
-                    )
+                    ),
                   ],
                 ),
               ),

diff --git a/lib/screens/department_screen/widgets/curriculum_section.dart b/lib/screens/department_screen/widgets/curriculum_section.dart
@@ -234,6 +234,7 @@ class _CurriculumSectionState extends State<CurriculumSection> {
     final isSelected = sem == _selectedSem;
 
     return InkWell(
+      splashFactory: NoSplash.splashFactory,
         borderRadius: BorderRadius.circular(8),
         onTap: () => setState(() => _selectedSem = sem),
         child: AnimatedContainer(
-Original file line number
+Diff line change
@@ Expand Up / @@ -841,9 +841,15 @@ class _MainScreenState extends ConsumerState<MainScreen> { @@
                                     )
                                   ]
                               ),
-                            )
+                            ),
+                          ],
+                        ),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            Text("App Version : v13.0.0",style: TextStyle(color: Colors.grey.shade700,fontSize: 12 ),),
                           ],
-                        )
+                        ),
                       ],
                     ),
                   ),
@@ Expand Down @@