Branch10

.metadata

@@ -1,10 +1,45 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: cf4400006550b70f28e4b4af815151d1e74846c6
+  revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
   channel: stable
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+    - platform: android
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+    - platform: ios
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+    - platform: linux
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+    - platform: macos
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+    - platform: web
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+    - platform: windows
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

android/app/build.gradle

@@ -8,7 +8,7 @@ if (localPropertiesFile.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  GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')

android/app/src/main/kotlin/com/android/application/sih_2022/MainActivity.kt

@@ -0,0 +1,6 @@
+package com.android.application.sih_2022
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}

lib/controllers/leader_board/leader_board_controller.dart

@@ -31,6 +31,7 @@ class LeaderBoardController extends GetxController {
       }
 
       leaderBoard.assignAll(allData);
+
       loadingStatus.value = LoadingStatus.completed;
     } catch (e) {
       loadingStatus.value = LoadingStatus.error;

lib/firebase_options.dart

@@ -1,7 +1,6 @@
 // File generated by FlutterFire CLI.
 // ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members
 import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
-
 import 'package:flutter/foundation.dart'
     show defaultTargetPlatform, kIsWeb, TargetPlatform;
 
@@ -24,15 +23,18 @@ class DefaultFirebaseOptions {
       case TargetPlatform.android:
         return android;
       case TargetPlatform.iOS:
-        return ios;
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for ios - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
       case TargetPlatform.macOS:
         throw UnsupportedError(
           'DefaultFirebaseOptions have not been configured for macos - '
           'you can reconfigure this by running the FlutterFire CLI again.',
         );
       case TargetPlatform.windows:
         throw UnsupportedError(
-          'DefaultFirebaseOptions have not been configured for windows - '
+          'DefaultFirebaseOptions have not been configured for Windows - '
           'you can reconfigure this by running the FlutterFire CLI again.',
         );
       case TargetPlatform.linux:
@@ -47,30 +49,21 @@ class DefaultFirebaseOptions {
     }
   }
 
-  static FirebaseOptions web = FirebaseOptions(
-      apiKey: "AIzaSyCgdzV5Xz0oF-Xkez3E6nT68GzaZAI8zdg",
-      authDomain: "quizx-fb763.firebaseapp.com",
-      projectId: "quizx-fb763",
-      storageBucket: "quizx-fb763.appspot.com",
-      messagingSenderId: "647627347924",
-      appId: "1:647627347924:web:fbaccef15fb1b680042841");
-
-  static const FirebaseOptions android = FirebaseOptions(
-    apiKey: 'AIzaSyDHIzxyLdlTQOfIC5QWDGWmzeq77dKaSd8',
-    appId: '1:647627347924:android:05e10c777a47b11f042841',
+  static const FirebaseOptions web = FirebaseOptions(
+    apiKey: 'AIzaSyCgdzV5Xz0oF-Xkez3E6nT68GzaZAI8zdg',
+    appId: '1:647627347924:web:cd71eb176dd3dab6042841',
     messagingSenderId: '647627347924',
     projectId: 'quizx-fb763',
+    authDomain: 'quizx-fb763.firebaseapp.com',
     storageBucket: 'quizx-fb763.appspot.com',
+    measurementId: 'G-GW90EX7F84',
   );
 
-  static const FirebaseOptions ios = FirebaseOptions(
-    apiKey: 'AIzaSyCgxvokEG6ljiCfGc6mYMrAgJV3snf5KlU',
-    appId: '1:647627347924:ios:334734b83ce23245042841',
+  static const FirebaseOptions android = FirebaseOptions(
+    apiKey: 'AIzaSyDHIzxyLdlTQOfIC5QWDGWmzeq77dKaSd8',
+    appId: '1:647627347924:android:4486b3a791306744042841',
     messagingSenderId: '647627347924',
     projectId: 'quizx-fb763',
     storageBucket: 'quizx-fb763.appspot.com',
-    iosClientId:
-        '647627347924-kbbtgj0ntatj9nh6avl8psk6de534src.apps.googleusercontent.com',
-    iosBundleId: 'com.codefox.sih_2022',
   );
 }

lib/models/timeline_model.dart

@@ -1,57 +1,57 @@
-// // ignore_for_file: unnecessary_this, prefer_collection_literals, unnecessary_new
+// ignore_for_file: unnecessary_this, prefer_collection_literals, unnecessary_new
 
-// class TimeLineList {
-//   String? images = '';
-//   String? id = '';
-//   String? ques = '';
-//   String? q1 = '';
-//   String q2 = '';
-//   String q3 = "";
-//   String views = '';
-//   String likes = '';
-//   String ans = '';
-//   String avatar = '';
+class TimeLineList {
+  String? images = '';
+  String? id = '';
+  String? ques = '';
+  String? q1 = '';
+  String q2 = '';
+  String q3 = "";
+  String views = '';
+  String likes = '';
+  String ans = '';
+  String avatar = '';
 
-//   TimeLineList({
-//     required this.images,
-//     required this.id,
-//     required this.ques,
-//     required this.q1,
-//     required this.q2,
-//     q3,
-//     required this.views,
-//     required this.likes,
-//     required this.ans,
-//     required this.avatar,
-//   });
+  TimeLineList({
+    required this.images,
+    required this.id,
+    required this.ques,
+    required this.q1,
+    required this.q2,
+    q3,
+    required this.views,
+    required this.likes,
+    required this.ans,
+    required this.avatar,
+  });
 
-//   TimeLineList.fromJson(Map<String, dynamic> json) {
-//     images = json['images'];
-//     id = json['id'];
-//     ques = json['ques'];
-//     q1 = json['q1'];
-//     q2 = json['q2'];
-//     q3 = json['q3'];
-//     views = json['views'];
-//     likes = json['likes'];
-//     ans = json['ans'];
-//     avatar = json['avatar'];
+  TimeLineList.fromJson(Map<String, dynamic> json) {
+    images = json['images'];
+    id = json['id'];
+    ques = json['ques'];
+    q1 = json['q1'];
+    q2 = json['q2'];
+    q3 = json['q3'];
+    views = json['views'];
+    likes = json['likes'];
+    ans = json['ans'];
+    avatar = json['avatar'];
 
-//     avatar = json['avatars'];
-//   }
-//   Map<String, dynamic> toJson() {
-//     final Map<String, dynamic> data = new Map<String, dynamic>();
-//     data['images'] = this.images;
-//     data['id'] = this.id;
-//     data['ques'] = this.ques;
-//     data['q1'] = this.q1;
-//     data['q2'] = this.q2;
-//     data['q3'] = this.q3;
-//     data['views'] = this.views;
-//     data['likes'] = this.likes;
-//     data['ans'] = this.ans;
-//     data['avatars'] = this.avatar;
+    avatar = json['avatars'];
+  }
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['images'] = this.images;
+    data['id'] = this.id;
+    data['ques'] = this.ques;
+    data['q1'] = this.q1;
+    data['q2'] = this.q2;
+    data['q3'] = this.q3;
+    data['views'] = this.views;
+    data['likes'] = this.likes;
+    data['ans'] = this.ans;
+    data['avatars'] = this.avatar;
 
-//     return data;
-//   }
-// }
+    return data;
+  }
+}

lib/screens/auth_and_profile/line_chart.dart

@@ -63,8 +63,8 @@ class _LineChart2State extends State<LineChart2> {
   }
 
   List<Color> gradientColors = [
-    const Color(0xff23b6e6),
-    const Color(0xff02d39a),
+    Color.fromARGB(255, 230, 224, 35),
+    Color.fromARGB(255, 219, 239, 43),
   ];
 
   @override
@@ -129,10 +129,10 @@ class _LineChart2State extends State<LineChart2> {
       lineBarsData: [
         LineChartBarData(
           spots: const [
-            FlSpot(0, 3),
-            FlSpot(2.6, 2),
-            FlSpot(4.9, 5),
-            FlSpot(6.8, 3.1),
+            FlSpot(0, 2.3),
+            FlSpot(2, 4.5),
+            FlSpot(4, 5.2),
+            FlSpot(6, 3.2),
             FlSpot(8, 4),
             FlSpot(9.5, 3),
             FlSpot(11, 4),