Fix merge conflicts

remove depricated libraries some minor changes
GOVINDDIXIT · Dec 12, 2020 · 46118cc · 46118cc
2 parents c52ad08 + 577ddbd
commit 46118cc
Show file tree

Hide file tree

Showing 21 changed files with 575 additions and 213 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -45,25 +45,24 @@ android {
 dependencies {
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
     implementation 'com.google.firebase:firebase-messaging:21.0.0'
     implementation 'com.google.firebase:firebase-core:17.5.1'
     implementation 'com.github.bumptech.glide:glide:4.8.0'
-    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 
     implementation 'org.jsoup:jsoup:1.13.1'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
-    //Storeage
+    //Storage
     implementation 'com.google.firebase:firebase-core:17.5.1'
     implementation 'com.google.firebase:firebase-database:19.5.1'
+
     //Google Sign In
     implementation 'com.google.firebase:firebase-auth:19.4.0'
     implementation 'com.google.android.gms:play-services-auth:18.1.0'
@@ -79,11 +78,6 @@ dependencies {
     //PDF Viewer
     implementation 'com.github.barteksc:android-pdf-viewer:2.8.2'
 
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-
-    implementation 'com.android.support:cardview-v7:28.0.0'
-
     //circleimageview
     implementation 'de.hdodenhof:circleimageview:3.1.0'
 

diff --git a/app/src/main/assets/timetable/cs1sem.json b/app/src/main/assets/timetable/cs1sem.json
@@ -1,47 +1,86 @@
 {
   "Monday": {
-    "9:00-10:00": "SM130",
-    "10:00-11:00": "FEE132",
-    "11:00-11:15": "Break",
-    "11:15-12:15": "LA130",
-    "12:15-1:15": "IITP132",
-    "1:15-3:00": "Lunch",
-    "3:00-6:00": "FEE132 LAB"
+    "08:00-09:00": "-",
+    "09:00-10:00": "PC130",
+    "10:00-11:00": "-",
+    "11:00-12:00": "Calc",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "IITP132",
+    "14:00-15:00": "IITP132 LAB",
+    "15:00-16:00": "IITP132 LAB",
+    "16:00-17:00": "-",
+    "17:00-18:00": "-"
   },
   "Tuesday": {
-    "9:00-10:00": "SM130",
-    "10:00-11:00": "LA130",
-    "11:00-11:15": "Break",
-    "11:15-12:15": "FEE132",
-    "12:15-1:15": "IITP132",
-    "1:15-3:00": "Lunch",
-    "3:00-6:00": "IITP132 LAB"
+    "08:00-09:00": "-",
+    "09:00-10:00": "IITP132",
+    "10:00-11:00": "-",
+    "11:00-12:00": "Calc",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "",
+    "14:00-15:00": "",
+    "15:00-16:00": "IITP132 LAB",
+    "16:00-17:00": "IITP132 LAB",
+    "17:00-18:00": ""
   },
   "Wednesday": {
-    "9:00-10:00": "IITP132",
-    "10:00-11:00": "PC130",
-    "11:00-11:15": "Break",
-    "11:15-12:15": "LA130",
-    "12:15-1:15": "FEE132",
-    "1:15-3:00": "Lunch",
-    "3:00-6:00": "-"
+    "08:00-09:00": "Sports-1",
+    "09:00-10:00": "FEE132",
+    "10:00-11:00": "IITP132",
+    "11:00-12:00": "Calc",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "",
+    "14:00-15:00": "",
+    "15:00-16:00": "FEE132 LAB",
+    "16:00-17:00": "FEE132 LAB",
+    "17:00-18:00": ""
   },
   "Thursday": {
-    "9:00-10:00": "PC130",
-    "10:00-11:00": "SM130",
-    "11:00-11:15": "Break",
-    "11:15-12:15": "-",
-    "12:15-1:15": "-",
-    "1:15-3:00": "Lunch",
-    "3:00-6:00": "-"
+    "08:00-09:00": "Sports-1",
+    "09:00-10:00": "FEE132",
+    "10:00-11:00": "-",
+    "11:00-12:00": "PC130",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "-",
+    "14:00-15:00": "-",
+    "15:00-16:00": "-",
+    "16:00-17:00": "-",
+    "17:00-18:00": "-"
   },
   "Friday": {
-    "9:00-10:00": "PC130",
+    "08:00-09:00": "Sports-1",
+    "09:00-10:00": "FEE132",
+    "10:00-11:00": "-",
+    "11:00-12:00": "PC130",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "FEE132 LAB",
+    "14:00-15:00": "FEE132 LAB",
+    "15:00-16:00": "-",
+    "16:00-17:00": "-",
+    "17:00-18:00": "-"
+  },
+  "Saturday": {
+    "08:00-09:00": "-",
+    "09:00-10:00": "SM130",
+    "10:00-11:00": "-",
+    "11:00-12:00": "-",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "-",
+    "14:00-15:00": "SM130 LAB",
+    "15:00-16:00": "SM130 LAB",
+    "16:00-17:00": "-",
+    "17:00-18:00": "-"
+  },
+  "Sunday": {
+    "08:00-09:00": "-",
+    "09:00-10:00": "-",
     "10:00-11:00": "-",
-    "11:00-11:15": "Break",
-    "11:15-12:15": "-",
-    "12:15-1:15": "-",
-    "1:15-3:00": "Lunch",
-    "3:00-6:00": "-"
+    "11:00-12:00": "SM130",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "SM130",
+    "14:00-15:00": "SM130 LAB",
+    "15:00-16:00": "SM130 LAB",
+    "16:00-17:00": "-",
+    "17:00-18:00": "-"
   }
 }
diff --git a/app/src/main/assets/timetable/cs2sem.json b/app/src/main/assets/timetable/cs2sem.json
@@ -5,7 +5,7 @@
     "11:00-11:15": "Break",
     "11:15-12:15": "PS230",
     "12:15-1:15": "DLC232",
-    "1:15-3:00": "Lunch",
+    "1:15-3:00": "Break",
     "3:00-6:00": "PCE LAB"
   },
   "Tuesday": {
@@ -14,7 +14,7 @@
     "11:00-11:15": "Break",
     "11:15-12:15": "-",
     "12:15-1:15": "DLC232",
-    "1:15-3:00": "Lunch",
+    "1:15-3:00": "Break",
     "3:00-6:00": "DLC232 LAB"
   },
   "Wednesday": {
@@ -23,7 +23,7 @@
     "11:00-11:15": "Break",
     "11:15-12:15": "PS230",
     "12:15-1:15": "PC230",
-    "1:15-3:00": "Lunch",
+    "1:15-3:00": "Break",
     "3:00-6:00": "-"
   },
   "Thursday": {
@@ -32,7 +32,7 @@
     "11:00-11:15": "Break",
     "11:15-12:15": "PCE230",
     "12:15-1:15": "-",
-    "1:15-3:00": "Lunch",
+    "1:15-3:00": "Break",
     "3:00-6:00": "DS232 LAB"
   },
   "Friday": {
@@ -41,7 +41,7 @@
     "11:00-11:15": "Break",
     "11:15-12:15": "-",
     "12:15-1:15": "PS230 Tute",
-    "1:15-3:00": "Lunch",
+    "1:15-3:00": "Break",
     "3:00-6:00": "-"
   }
 }
diff --git a/app/src/main/assets/timetable/csai1sem.json b/app/src/main/assets/timetable/csai1sem.json
@@ -0,0 +1,86 @@
+{
+  "Monday": {
+    "08:00-09:00": "-",
+    "09:00-10:00": "PC130",
+    "10:00-11:00": "-",
+    "11:00-12:00": "Calc",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "IITP132",
+    "14:00-15:00": "IITP132 LAB",
+    "15:00-16:00": "IITP132 LAB",
+    "16:00-17:00": "-",
+    "17:00-18:00": "-"
+  },
+  "Tuesday": {
+    "08:00-09:00": "-",
+    "09:00-10:00": "IITP132",
+    "10:00-11:00": "-",
+    "11:00-12:00": "Calc",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "",
+    "14:00-15:00": "",
+    "15:00-16:00": "IITP132 LAB",
+    "16:00-17:00": "IITP132 LAB",
+    "17:00-18:00": ""
+  },
+  "Wednesday": {
+    "08:00-09:00": "Sports-1",
+    "09:00-10:00": "FEE132",
+    "10:00-11:00": "IITP132",
+    "11:00-12:00": "Calc",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "",
+    "14:00-15:00": "",
+    "15:00-16:00": "FEE132 LAB",
+    "16:00-17:00": "FEE132 LAB",
+    "17:00-18:00": ""
+  },
+  "Thursday": {
+    "08:00-09:00": "Sports-1",
+    "09:00-10:00": "FEE132",
+    "10:00-11:00": "-",
+    "11:00-12:00": "PC130",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "-",
+    "14:00-15:00": "-",
+    "15:00-16:00": "-",
+    "16:00-17:00": "-",
+    "17:00-18:00": "-"
+  },
+  "Friday": {
+    "08:00-09:00": "Sports-1",
+    "09:00-10:00": "FEE132",
+    "10:00-11:00": "-",
+    "11:00-12:00": "PC130",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "FEE132 LAB",
+    "14:00-15:00": "FEE132 LAB",
+    "15:00-16:00": "-",
+    "16:00-17:00": "-",
+    "17:00-18:00": "-"
+  },
+  "Saturday": {
+    "08:00-09:00": "-",
+    "09:00-10:00": "SM130",
+    "10:00-11:00": "-",
+    "11:00-12:00": "-",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "-",
+    "14:00-15:00": "SM130 LAB",
+    "15:00-16:00": "SM130 LAB",
+    "16:00-17:00": "-",
+    "17:00-18:00": "-"
+  },
+  "Sunday": {
+    "08:00-09:00": "-",
+    "09:00-10:00": "-",
+    "10:00-11:00": "-",
+    "11:00-12:00": "SM130",
+    "12:00-12:15": "Break",
+    "12:15-13:15": "SM130",
+    "14:00-15:00": "SM130 LAB",
+    "15:00-16:00": "SM130 LAB",
+    "16:00-17:00": "-",
+    "17:00-18:00": "-"
+  }
+}