Flutter 3

.env.dev

@@ -0,0 +1 @@
+KEY="Tolm_fRDkfoN5WMU4oUXWxNwmn1E0MmYlbeh1LA29cU=";

.gitignore

@@ -10,6 +10,7 @@
 .history
 .svn/
 *.env
+.env
 .fvm
 # IntelliJ related
 *.iml

android/app/build.gradle

@@ -31,7 +31,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 // }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 34
     ndkVersion "26.1.10909125"
 
     lintOptions {
@@ -44,7 +44,7 @@ android {
     defaultConfig {
         applicationId "app.insti.flutter"
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 32
         versionName "2.4.4"
         multiDexEnabled true
@@ -77,12 +77,14 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'app.insti.flutter'
 }
 
 flutter {
     source '../..'
 }
 
+
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
@@ -93,8 +95,8 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
     implementation 'com.google.firebase:firebase-core:16.0.1'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9'
-    compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
     // implementation "androidx.work:work-runtime-ktx:2.7.0"
 }
 

android/build.gradle

@@ -2,7 +2,7 @@ buildscript {
     ext {
         ndkVersion = "26.1.10909125"
     }
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.22'
     repositories {
         google()
         jcenter()
@@ -11,7 +11,7 @@ buildscript {
 
     dependencies {
         classpath 'com.google.gms:google-services:4.3.0'
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

android/gradle.properties

@@ -1,4 +1,4 @@
-android.enableJetifier=true
-android.useAndroidX=true
+ android.enableJetifier=true
+ android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1024m
 android.enableR8=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip

assets/login/login.html

@@ -130,10 +130,10 @@
           class="login"
           id="loginLink"
           onclick="showLoading()"
-          href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=vR1pU7wXWyve1rUkg0fMS6StL1Kr6paoSmRIiLXJ&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html"
-        >
+          href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=MQXcx3EHMqoGW57dXM27j2HSzEpvGAARASXraRmX&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html">
+          >
+          <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=vR1pU7wXWyve1rUkg0fMS6StL1Kr6paoSmRIiLXJ&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html" -->
           <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=5jyMJufq0Vk0aDlj9Hnudsj84UfbFZlYRUnn02Xd&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html">  -->
-          <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=MQXcx3EHMqoGW57dXM27j2HSzEpvGAARASXraRmX&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html"> -->
           <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=gxzx6u7aw6wco6SJBioORPwum5Sug7OrIPrm8r2W&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html"> -->
           <!-- href="https://gymkhana.iitb.ac.in/sso/account/login/?next=/sso/oauth/authorize/%3Fclient_id%3Dl3Scj8qKuIRqOg7eaAy54tC8AkEd03Hb9oss8gv7%26response_type%3Dcode%26scope%3Dbasic%2520profile%2520picture%2520sex%2520ldap%2520phone%2520insti_address%2520program%2520secondary_emails%26redirect_uri=https://redirecturi"> -->
           LOG IN VIA SSO

assets/login/login_dark.html

@@ -133,11 +133,11 @@
         <a
           class="login"
           onclick="showLoading()"
-          href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=vR1pU7wXWyve1rUkg0fMS6StL1Kr6paoSmRIiLXJ&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html"
-        >
+          href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=MQXcx3EHMqoGW57dXM27j2HSzEpvGAARASXraRmX&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html">
+          >
+          <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=vR1pU7wXWyve1rUkg0fMS6StL1Kr6paoSmRIiLXJ&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html" -->
           <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=5jyMJufq0Vk0aDlj9Hnudsj84UfbFZlYRUnn02Xd&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html">  -->
           <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=8iPdGfcUEoe6P3IHmQQ63CuPW4glQd1mbsdQtHkW&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html"> -->
-          <!-- href="https://gymkhana.iitb.ac.in/profiles/oauth/authorize/?client_id=MQXcx3EHMqoGW57dXM27j2HSzEpvGAARASXraRmX&response_type=code&scope=basic%20profile%20picture%20sex%20ldap%20phone%20insti_address%20program%20secondary_emails&redirect_uri=https://www.insti.app/login-android.html"> -->
           LOG IN VIA SSO
         </a>
         <div class="loading-circle" id="loadingSpinner"></div>

ios/Podfile

@@ -39,6 +39,12 @@ post_install do |installer|
     flutter_additional_ios_build_settings(target)
   end
 
+  ################  Awesome Notifications pod modification  ###################
+  awesome_pod_file = File.expand_path(File.join('plugins', 'awesome_notifications', 'ios', 'Scripts', 'AwesomePodFile'), '.symlinks')
+  require awesome_pod_file
+  update_awesome_pod_build_settings(installer)
+  ################  Awesome Notifications pod modification  ###################
+
   installer.generated_projects.each do |project|
     project.targets.each do |target|
             target.build_configurations.each do |config|
@@ -47,3 +53,9 @@ post_install do |installer|
         end
     end
 end
+
+################  Awesome Notifications pod modification  ###################
+awesome_pod_file = File.expand_path(File.join('plugins', 'awesome_notifications', 'ios', 'Scripts', 'AwesomePodFile'), '.symlinks')
+require awesome_pod_file
+update_awesome_main_target_settings('Runner', File.dirname(File.realpath(__FILE__)), flutter_root)
+################  Awesome Notifications pod modification  ###################

lib/main.dart

@@ -59,7 +59,7 @@ import 'package:uni_links/uni_links.dart';
 void main() async {
   GlobalKey<MyAppState> key = GlobalKey();
   WidgetsFlutterBinding.ensureInitialized();
-  await Firebase.initializeApp();
+  await Firebase.initializeApp(  );
   InstiAppBloc bloc = InstiAppBloc(wholeAppKey: key);
   FirebaseMessaging.onBackgroundMessage(sendMessage);
   await dotenv.load(fileName: ".env");
@@ -113,13 +113,13 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
       initAppLinksState();
     }
 
-    WidgetsBinding.instance?.addObserver(this);
+    WidgetsBinding.instance.addObserver(this);
   }
 
   @override
   void dispose() async {
     _appLinksSub.cancel();
-    WidgetsBinding.instance?.removeObserver(this);
+    WidgetsBinding.instance.removeObserver(this);
     disposeNotification();
     super.dispose();
   }
@@ -155,23 +155,21 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
         theme: ThemeData(
           // fontFamily: "SourceSansPro",
           fontFamily: "IBMPlexSans",
-
+          useMaterial3: false,
           primaryColor: widget.bloc.primaryColor,
           colorScheme: theme.colorScheme.copyWith(
             primary: widget.bloc.primaryColor,
             secondary: widget.bloc.accentColor,
             primaryContainer: widget.bloc.primaryColor[200],
             secondaryContainer: widget.bloc.accentColor[200],
             brightness: widget.bloc.brightness.toBrightness(),
-            onBackground: widget.bloc.brightness == AppBrightness.light
-                ? Colors.black
-                : Colors.white,
             surface: widget.bloc.brightness == AppBrightness.light
                 ? Colors.white
                 : widget.bloc.brightness.toColor(),
-            surfaceVariant: widget.bloc.brightness == AppBrightness.light
-                ? Color(0xFFE8ECF2)
-                : Color(0xFF121212),
+            surfaceContainerHighest:
+                widget.bloc.brightness == AppBrightness.light
+                    ? Color(0xFFE8ECF2)
+                    : Color(0xFF121212),
             onSurface: widget.bloc.brightness == AppBrightness.light
                 ? Colors.black
                 : Colors.white,
@@ -184,38 +182,81 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
           ),
           primarySwatch: Colors.primaries.firstWhereOrNull(
               (c) => c.value == widget.bloc.accentColor.value),
-
-          toggleableActiveColor: widget.bloc.accentColor,
           textSelectionTheme:
               TextSelectionThemeData(selectionColor: widget.bloc.accentColor),
 
           canvasColor: widget.bloc.brightness.toColor(),
-
-          bottomAppBarColor: widget.bloc.primaryColor,
           brightness: widget.bloc.brightness.toBrightness(),
 
           textTheme: TextTheme(
-              headline4: TextStyle(
+              headlineMedium: TextStyle(
                 color: widget.bloc.brightness == AppBrightness.light
                     ? Colors.black
                     : Colors.white,
               ),
-              headline3: TextStyle(
+              displaySmall: TextStyle(
                 color: widget.bloc.brightness == AppBrightness.light
                     ? Colors.black
                     : Colors.white,
               ),
-              headline2: TextStyle(
+              displayMedium: TextStyle(
                 color: widget.bloc.brightness == AppBrightness.light
                     ? Colors.black
                     : Colors.white,
               ),
-              headline1: TextStyle(
+              displayLarge: TextStyle(
                 color: widget.bloc.brightness == AppBrightness.light
                     ? Colors.black
                     : Colors.white,
               ),
-              headline5: TextStyle()),
+              headlineSmall: TextStyle()),
+          checkboxTheme: CheckboxThemeData(
+            fillColor: WidgetStateProperty.resolveWith<Color?>(
+                (Set<WidgetState> states) {
+              if (states.contains(WidgetState.disabled)) {
+                return null;
+              }
+              if (states.contains(WidgetState.selected)) {
+                return widget.bloc.accentColor;
+              }
+              return null;
+            }),
+          ),
+          radioTheme: RadioThemeData(
+            fillColor: WidgetStateProperty.resolveWith<Color?>(
+                (Set<WidgetState> states) {
+              if (states.contains(WidgetState.disabled)) {
+                return null;
+              }
+              if (states.contains(WidgetState.selected)) {
+                return widget.bloc.accentColor;
+              }
+              return null;
+            }),
+          ),
+          switchTheme: SwitchThemeData(
+            thumbColor: WidgetStateProperty.resolveWith<Color?>(
+                (Set<WidgetState> states) {
+              if (states.contains(WidgetState.disabled)) {
+                return null;
+              }
+              if (states.contains(WidgetState.selected)) {
+                return widget.bloc.accentColor;
+              }
+              return null;
+            }),
+            trackColor: WidgetStateProperty.resolveWith<Color?>(
+                (Set<WidgetState> states) {
+              if (states.contains(WidgetState.disabled)) {
+                return null;
+              }
+              if (states.contains(WidgetState.selected)) {
+                return widget.bloc.accentColor;
+              }
+              return null;
+            }),
+          ),
+          bottomAppBarTheme: BottomAppBarTheme(color: widget.bloc.primaryColor),
         ),
         onGenerateRoute: (RouteSettings settings) {
           // print(settings.name);

lib/src/api/apiclient.dart

@@ -46,8 +46,8 @@ import 'model/offersecret.dart';
 part 'apiclient.g.dart';
 
 // @rt.RestApi(baseUrl: "http://127.0.0.1:8000/api")
-// @rt.RestApi(baseUrl: "http://10.105.177.150/api")
-@rt.RestApi(baseUrl: "https://gymkhana.iitb.ac.in/instiapp/api")
+@rt.RestApi(baseUrl: "http://10.198.49.150/api")
+// @rt.RestApi(baseUrl: "https://gymkhana.iitb.ac.in/instiapp/api")
 // @rt.RestApi(baseUrl: "https://dcae-2405-201-5004-30e9-a45d-9897-ea81-3414.ngrok-free.app/api")
 abstract class InstiAppApi {
   factory InstiAppApi(Dio dio, {String baseUrl}) = _InstiAppApi;