Merge pull request #280 from mirea-ninja/release/v1.3.0

Release v1.3.0

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.0.5'
+          flutter-version: '3.7.0'
       - run: flutter pub get
       - name: Run Tests
         run: flutter test

.github/workflows/pre-release.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.0.5'
+          flutter-version: '3.7.0'
       - run: flutter pub get
       - name: Run Tests
         run: flutter test

.github/workflows/tests.yml

@@ -17,7 +17,7 @@ jobs:
         java-version: '12.x'
     - uses: subosito/flutter-action@v1
       with:
-        flutter-version: '3.0.5'
+        flutter-version: '3.7.0'
         channel: 'stable' # or: 'beta', 'dev' or 'master'
     - run: flutter pub get
     - run: flutter test ./test/mirea_test.dart

android/app/build.gradle

@@ -28,7 +28,7 @@ apply plugin: 'com.google.gms.google-services'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 33
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -48,7 +48,7 @@ android {
         multiDexEnabled true
         applicationId "ninja.mirea.mireaapp"
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 32
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

android/app/google-services.json

@@ -0,0 +1,46 @@
+{
+  "project_info": {
+    "project_number": "510978291920",
+    "project_id": "rtu-mirea-app",
+    "storage_bucket": "rtu-mirea-app.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:510978291920:android:0c6dc2379d80661b8c46d5",
+        "android_client_info": {
+          "package_name": "ninja.mirea.mireaapp"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "510978291920-l17hjoc3ltfj74e73bj73phfivhusppu.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCTfdp1rBC6PkVjwOdZ5XM7_zzwoN0BVPM"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "510978291920-l17hjoc3ltfj74e73bj73phfivhusppu.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "510978291920-31sgk97k4bifhc0ebpamk9m46om2e50r.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "mirea.ninja.mireaapp"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -3,18 +3,29 @@
     package="ninja.mirea.mireaapp">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.NFC" />
 
    <application
         android:label="Ninja Mirea"
         android:usesCleartextTraffic="true"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:fullBackupContent="@xml/backup_rules">
+        <activity android:name="com.linusu.flutter_web_auth_2.CallbackActivity" android:exported="true">
+            <intent-filter android:label="flutter_web_auth_2">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="ninja.mirea.mireaapp" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
@@ -55,7 +66,8 @@
         </receiver>
 
        <!-- Used for Background Work -->
-       <receiver android:name="ninja.mirea.mireaapp.widget_channel.HomeWidgetBackgroundReceiver">
+       <receiver android:name="ninja.mirea.mireaapp.widget_channel.HomeWidgetBackgroundReceiver"
+        android:exported="true">
            <intent-filter>
                <action android:name="es.antonborri.home_widget.action.BACKGROUND" />
            </intent-filter>

android/app/src/main/kotlin/ninja/mirea/mireaapp/HomeWidgerProvider.kt

@@ -29,7 +29,7 @@ class HomeWidgetProvider : AbstractHomeWidgetProvider() {
         // Reload widget every midnight
         val intent = Intent(context, HomeWidgetProvider::class.java)
         intent.action = ACTION_AUTO_UPDATE_WIDGET
-        val pIntent = PendingIntent.getBroadcast(context, 0, intent, 0)
+        val pIntent = PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
         val alarmManager = context
             .getSystemService(Context.ALARM_SERVICE) as AlarmManager
         val c = Calendar.getInstance()
@@ -124,7 +124,7 @@ class HomeWidgetProvider : AbstractHomeWidgetProvider() {
         super.onDisabled(context)
         val intent = Intent(ACTION_AUTO_UPDATE_WIDGET)
         val alarmMgr = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        alarmMgr.cancel(PendingIntent.getBroadcast(context, 0, intent, 0))
+        alarmMgr.cancel(PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_IMMUTABLE))
     }
 
     override fun onReceive(context: Context?, intent: Intent) {

android/app/src/main/kotlin/ninja/mirea/mireaapp/widget_channel/HomeWidgetIntent.kt

@@ -19,7 +19,7 @@ object HomeWidgetLaunchIntent {
         intent.data = uri
         intent.action = HOME_WIDGET_LAUNCH_ACTION
 
-        return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
     }
 }
 
@@ -32,6 +32,6 @@ object HomeWidgetBackgroundIntent {
         intent.data = uri
         intent.action = HOME_WIDGET_BACKGROUND_ACTION
 
-        return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
     }
 }

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@drawable/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/monochrome_icon"/>
 </adaptive-icon>

android/app/src/main/res/xml/backup_rules.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <!-- Exclude FlutterSecureStorage (plugin) from backup -->
+    <exclude domain="sharedpref" path="FlutterSecureStorage"/>
+</full-backup-content>

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.8'

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.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip