Merge pull request #113 from devout-coder/main

Merging changes pertaining to new ui, railway concession, notes
TSEC-MAD-Club · Apr 18, 2024 · 77b05f5 · 77b05f5
2 parents 8f61d80 + b875b21
commit 77b05f5
Show file tree

Hide file tree

Showing 112 changed files with 11,857 additions and 1,346 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -14,7 +14,7 @@ if (keystorePropertiesFile.exists()) {
 
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+    throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
@@ -46,8 +46,10 @@ android {
         applicationId "com.madclubtsec.tsec_application"
         minSdkVersion 19
         targetSdkVersion 33
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        // versionCode flutterVersionCode.toInteger()
+        // versionName flutterVersionName
+        versionCode 20 
+        versionName "12.0.0" 
         multiDexEnabled true
     }
 

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Jun 04 23:40:58 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
diff --git a/assets/data/faculty_details/cs.json b/assets/data/faculty_details/cs.json
@@ -224,4 +224,4 @@
     "phd_guide" : "na",
     "qualification" : "M.E ( Computer Engineering)"
   } ]
-
+
diff --git a/assets/fonts/Inter-Bold.ttf b/assets/fonts/Inter-Bold.ttf
diff --git a/assets/fonts/Inter-ExtraBold.ttf b/assets/fonts/Inter-ExtraBold.ttf
diff --git a/assets/fonts/Inter-Medium.ttf b/assets/fonts/Inter-Medium.ttf
diff --git a/assets/fonts/Inter-Regular.ttf b/assets/fonts/Inter-Regular.ttf
diff --git a/assets/fonts/Inter-SemiBold.ttf b/assets/fonts/Inter-SemiBold.ttf
diff --git a/assets/fonts/priego-bold.otf b/assets/fonts/priego-bold.otf
diff --git a/assets/fonts/priego-extrabold.otf b/assets/fonts/priego-extrabold.otf
diff --git a/assets/fonts/priego-medium.otf b/assets/fonts/priego-medium.otf
diff --git a/assets/fonts/priego-regular.otf b/assets/fonts/priego-regular.otf
diff --git a/assets/fonts/priego-semibold.otf b/assets/fonts/priego-semibold.otf
diff --git a/assets/images/app_bar/notes.png b/assets/images/app_bar/notes.png
diff --git a/assets/images/railwayConcession.png b/assets/images/railwayConcession.png
diff --git a/flutter_jank_metrics_01.json b/flutter_jank_metrics_01.json
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -224,4 +224,4 @@
		"phd_guide" : "na",
		"qualification" : "M.E ( Computer Engineering)"
		} ]