reboot to flutter-1.22.4

.gitignore

@@ -90,3 +90,5 @@ unlinked_spec.ds
 # Local files
 login_response.json
 
+.flutter-plugins-dependencies
+ios/Flutter/flutter_export_environment.sh

android/app/build.gradle

@@ -46,18 +46,19 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    signingConfigs {
-        release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
-    }
+    // signingConfigs {
+    //     release {
+    //         keyAlias keystoreProperties['keyAlias']
+    //         keyPassword keystoreProperties['keyPassword']
+    //         storeFile file(keystoreProperties['storeFile'])
+    //         storePassword keystoreProperties['storePassword']
+    //     }
+    // }
 
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            signingConfig signingConfigs.debug
+            // signingConfig signingConfigs.release
         }
     }
 }
@@ -70,7 +71,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
-   implementation 'com.google.firebase:firebase-core:16.0.1'
+    implementation 'com.google.firebase:firebase-core:16.0.1'
 }
 
 apply plugin: 'com.google.gms.google-services'

android/app/src/main/AndroidManifest.xml

@@ -17,10 +17,13 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
         android:label="InstiApp"
         android:icon="@mipmap/ic_launcher_round"
         android:roundIcon="@mipmap/ic_launcher_round">
+
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
 
         <meta-data android:name="com.google.android.geo.API_KEY"
                android:value="AIzaSyAryoUjEhGTWvgrInX1rDAR3D3DEXD5Z7M"/>
@@ -36,9 +39,19 @@
                  until Flutter renders its first frame. It can be removed if
                  there is no splash screen (such as the default splash screen
                  defined in @style/LaunchTheme). -->
+
+            <!-- Specify that the launch screen should continue being displayed -->
+            <!-- until Flutter renders its first frame. -->
+            <meta-data
+                android:name="io.flutter.embedding.android.SplashScreenDrawable"
+                android:resource="@drawable/launch_background" />
+
+            <!-- Theme to apply as soon as Flutter begins rendering frames -->
             <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme"
+                />
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

android/app/src/main/java/app/insti/flutter/MainActivity.java

@@ -1,13 +1,6 @@
 package app.insti.flutter;
 
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.embedding.android.FlutterActivity;
 
 public class MainActivity extends FlutterActivity {
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    GeneratedPluginRegistrant.registerWith(this);
-  }
 }

android/app/src/main/res/values/styles.xml

@@ -5,4 +5,8 @@
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
+
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
 </resources>

android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.google.gms:google-services:4.0.1'
+        classpath 'com.google.gms:google-services:4.3.0'
         classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }

android/gradle.properties

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

android/settings_aar.gradle

@@ -0,0 +1 @@
+include ':app'

lib/main.dart

@@ -38,6 +38,7 @@ import 'package:uni_links/uni_links.dart';
 void main() async {
   GlobalKey<MyAppState> key = GlobalKey();
   InstiAppBloc bloc = InstiAppBloc(wholeAppKey: key);
+  WidgetsFlutterBinding.ensureInitialized();
   var temp = bloc.restorePrefs();
 
   await temp;
@@ -91,7 +92,7 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     if (state == AppLifecycleState.paused ||
-        state == AppLifecycleState.suspending) {
+        state == AppLifecycleState.detached) {
       widget?.bloc?.saveToCache();
     }
   }
@@ -134,27 +135,27 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
           brightness: widget.bloc.brightness.toBrightness(),
 
           textTheme: TextTheme(
-              display1: TextStyle(
+              headline4: TextStyle(
                 color: widget.bloc.brightness == AppBrightness.light
                     ? Colors.black
                     : Colors.white,
               ),
-              display2: TextStyle(
+              headline3: TextStyle(
                 color: widget.bloc.brightness == AppBrightness.light
                     ? Colors.black
                     : Colors.white,
               ),
-              display3: TextStyle(
+              headline2: TextStyle(
                 color: widget.bloc.brightness == AppBrightness.light
                     ? Colors.black
                     : Colors.white,
               ),
-              display4: TextStyle(
+              headline1: TextStyle(
                 color: widget.bloc.brightness == AppBrightness.light
                     ? Colors.black
                     : Colors.white,
               ),
-              headline: TextStyle()),
+              headline5: TextStyle()),
         ),
         onGenerateRoute: (RouteSettings settings) {
           if (settings.name.startsWith("/event/")) {

lib/src/api/apiclient.dart

@@ -127,7 +127,9 @@ class InstiAppApi extends ApiClient with _$InstiAppApiClient {
   Future<void> updateUserEventStatus(@Header("Cookie") String sessionID,
       @PathParam() String eventID, @QueryParam("status") int status);
 
-  @GetReq(path: "/user-me/unr/:postID")
+  @GetReq(
+    path: "/user-me/unr/:postID",
+  )
   Future<void> updateUserNewsReaction(@Header("Cookie") String sessionID,
       @PathParam() String postID, @QueryParam("reaction") int reaction);
 

lib/src/api/model/event.dart

@@ -63,7 +63,7 @@ class Event {
   int eventUserUesInt;
 
   @Ignore()
-  UES get eventUserUes => UES.values[eventUserUesInt];
+  UES get eventUserUes => UES.values[eventUserUesInt ?? 0];
 
   @Ignore()
   set eventUserUes(UES ues) {

lib/src/blocs/blog_bloc.dart

@@ -12,7 +12,7 @@ enum PostType { Placement, Training, NewsArticle }
 
 class PostBloc {
   // Streams
-  Stream<UnmodifiableListView<Post>> get blog => _blogSubject.stream;
+  ValueStream<UnmodifiableListView<Post>> get blog => _blogSubject.stream;
   final _blogSubject = BehaviorSubject<UnmodifiableListView<Post>>();
 
   Sink<int> get inPostIndex => _indexController.sink;

lib/src/blocs/calendar_bloc.dart

@@ -21,10 +21,10 @@ class CalendarBloc {
   InstiAppBloc bloc;
 
   // Streams
-  Stream<Map<DateTime, List<Event>>> get events => _eventsSubject.stream;
+  ValueStream<Map<DateTime, List<Event>>> get events => _eventsSubject.stream;
   final _eventsSubject = BehaviorSubject<Map<DateTime, List<Event>>>();
 
-  Stream<bool> get loading => _loadingSubject.stream;
+  ValueStream<bool> get loading => _loadingSubject.stream;
   final _loadingSubject = BehaviorSubject<bool>();
 
   // State

lib/src/blocs/complaints_bloc.dart

@@ -1,4 +1,4 @@
-import 'dart:async';
+// import 'dart:async';
 import 'dart:collection';
 import 'dart:math';
 
@@ -21,11 +21,11 @@ class ComplaintsBloc {
   InstiAppBloc bloc;
 
   // Streams
-  Stream<UnmodifiableListView<Complaint>> get allComplaints =>
+  ValueStream<UnmodifiableListView<Complaint>> get allComplaints =>
       _complaintsSubject.stream;
   final _complaintsSubject = BehaviorSubject<UnmodifiableListView<Complaint>>();
 
-  Stream<UnmodifiableListView<Complaint>> get myComplaints =>
+  ValueStream<UnmodifiableListView<Complaint>> get myComplaints =>
       _mycomplaintsSubject.stream;
   final _mycomplaintsSubject =
       BehaviorSubject<UnmodifiableListView<Complaint>>();

lib/src/blocs/drawer_bloc.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:rxdart/rxdart.dart';
 
 class DrawerBloc {
-  Stream<int> get highlightPageIndex => _pageIndexSubject.stream;
+  ValueStream<int> get highlightPageIndex => _pageIndexSubject.stream;
   final _pageIndexSubject = BehaviorSubject<int>();
 
   String currentRoute;

lib/src/blocs/explore_bloc.dart

@@ -15,7 +15,7 @@ class ExploreBloc {
   InstiAppBloc bloc;
 
   // Streams
-  Stream<ExploreResponse> get explore => _exploreSubject.stream;
+  ValueStream<ExploreResponse> get explore => _exploreSubject.stream;
   final _exploreSubject = BehaviorSubject<ExploreResponse>();
 
   // Params

lib/src/blocs/ia_bloc.dart

@@ -43,16 +43,17 @@ class InstiAppBloc {
   final FirebaseMessaging firebaseMessaging = FirebaseMessaging();
 
   // Different Streams for the state
-  Stream<UnmodifiableListView<Hostel>> get hostels => _hostelsSubject.stream;
+  ValueStream<UnmodifiableListView<Hostel>> get hostels =>
+      _hostelsSubject.stream;
   final _hostelsSubject = BehaviorSubject<UnmodifiableListView<Hostel>>();
 
-  Stream<Session> get session => _sessionSubject.stream;
+  ValueStream<Session> get session => _sessionSubject.stream;
   final _sessionSubject = BehaviorSubject<Session>();
 
-  Stream<UnmodifiableListView<Event>> get events => _eventsSubject.stream;
+  ValueStream<UnmodifiableListView<Event>> get events => _eventsSubject.stream;
   final _eventsSubject = BehaviorSubject<UnmodifiableListView<Event>>();
 
-  Stream<UnmodifiableListView<ntf.Notification>> get notifications =>
+  ValueStream<UnmodifiableListView<ntf.Notification>> get notifications =>
       _notificationsSubject.stream;
   final _notificationsSubject =
       BehaviorSubject<UnmodifiableListView<ntf.Notification>>();

lib/src/blocs/map_bloc.dart

@@ -15,7 +15,8 @@ class MapBloc {
   InstiAppBloc bloc;
 
   // Streams
-  Stream<UnmodifiableListView<Venue>> get locations => _locationsSubject.stream;
+  ValueStream<UnmodifiableListView<Venue>> get locations =>
+      _locationsSubject.stream;
   final _locationsSubject = BehaviorSubject<UnmodifiableListView<Venue>>();
 
   // State