Merge pull request #294 from Manuito83/develop

Merge for v3.6.0

Author: Manuito83

.gitignore

@@ -2,7 +2,7 @@
 /lib/config/
 /lib/torn-pda-native/
 
-# Miscellaneous
+# Miscellaneoussure
 *.class
 *.lock
 *.log
@@ -16,6 +16,10 @@
 .VSCodeCounter/
 .fvm
 
+# ENV
+.env
+*env.g.dart
+
 # IntelliJ related
 *.iml
 *.ipr

.metadata

@@ -4,7 +4,27 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 18cd7a3601bcffb36fdf2f679f763b5e827c2e8e
-  channel: beta
+  revision: "2663184aa79047d0a33a14a3b607954f8fdd8730"
+  channel: "stable"
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+    - platform: windows
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+
+  # 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

@@ -16,12 +16,12 @@ if (localPropertiesFile.exists()) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    flutterVersionCode = '450'
+    flutterVersionCode = '463'
 }
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
-    flutterVersionName = '3.5.2'
+    flutterVersionName = '3.6.0'
 }
 
 def keystoreProperties = new Properties()

android/app/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM"/>
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -32,6 +33,7 @@
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize"
             android:exported="true">
+            <meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
             <meta-data
                 android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme" />
@@ -56,14 +58,14 @@
                 <data android:scheme="https" android:host="wiki.torn.com" />
                 <data android:scheme="http" android:host="api.torn.com" />
                 <data android:scheme="https" android:host="api.torn.com" />
-                <data android:pathPattern="/.*" />
+                <data android:pathPattern=".*" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tornpda" android:host="*" />
-                <data android:pathPattern="/.*" />
+                <data android:pathPattern=".*" />
             </intent-filter>
         </activity>
         <provider

android/app/src/main/java/com/manuito/tornpda/MainActivity.java

@@ -9,13 +9,15 @@
 import android.app.NotificationManager;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Build;
 import java.util.List;
 import io.flutter.plugin.common.MethodChannel;
 import android.os.Bundle;
 import android.window.SplashScreenView;
 import androidx.core.view.WindowCompat;
 import android.appwidget.AppWidgetManager;
+import android.os.PowerManager;
 
 public class MainActivity extends FlutterActivity {
     private static final String CHANNEL = "tornpda.channel";
@@ -49,24 +51,28 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
                 .setMethodCallHandler((call, result) -> {
                     if (call.method.equals("cancelNotifications")) {
                         cancelNotifications();
-                    }
-
-                    if (call.method.equals("deleteNotificationChannels")) {
+                    } else if (call.method.equals("deleteNotificationChannels")) {
                         deleteNotificationChannels();
-                    }
-
-                    if (call.method.equals("widgetCount")) {
+                    } else if (call.method.equals("widgetCount")) {
                         AppWidgetManager lala = AppWidgetManager.getInstance(this);
                         ComponentName name = new ComponentName(this, HomeWidgetTornPda.class);
                         result.success(lala.getAppWidgetIds(name));
+                    } else if (call.method.equals("checkBatteryOptimization")) {
+                        boolean isRestricted = isBatteryOptimizationRestricted();
+                        result.success(isRestricted);
+                    } else if (call.method.equals("openBatterySettings")) {
+                        openBatterySettings();
+                        result.success(null);
+                    } else {
+                        result.notImplemented();
                     }
                 });
     }
 
-    // This cancel Firebase notifications upon request from the Flutter app, as the
-    // local plugins also cancels its scheduled ones when cancelAll() is called.
+    // This cancels Firebase notifications upon request from the Flutter app, as the
+    // local plugins also cancel their scheduled ones when cancelAll() is called.
     // Note: It is also possible to use "cancel("TAG", 0)" but giving a TAG in FCM
-    // Android options overwrites the notifications with same tag.
+    // Android options overwrites the notifications with the same tag.
     // There is an alternative which is preparing multiple tags.
     private void cancelNotifications() {
         NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
@@ -76,7 +82,6 @@ private void cancelNotifications() {
     // Deletes all notification channels
     private void deleteNotificationChannels() {
         // Oreo or above, otherwise it will fail (can't be cached in Flutter)
-        // https://developer.android.com/reference/android/os/Build.VERSION_CODES#O
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             NotificationManager notificationManager = (NotificationManager) getSystemService(
                     Context.NOTIFICATION_SERVICE);
@@ -86,4 +91,20 @@ private void deleteNotificationChannels() {
             }
         }
     }
-}
+
+    // Checks if the battery optimization is restricted
+    private boolean isBatteryOptimizationRestricted() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
+            String packageName = getPackageName();
+            return !powerManager.isIgnoringBatteryOptimizations(packageName);
+        }
+        return false; // Not restricted for versions below Marshmallow
+    }
+
+    // Opens the battery optimization settings screen
+    private void openBatterySettings() {
+        Intent intent = new Intent(android.provider.Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS);
+        startActivity(intent);
+    }
+}

android/app/src/main/res/drawable/notification_chat.png

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools"
-    tools:keep="@drawable/*,@raw/slow_spring_board,@raw/aircraft_seatbelt,@raw/sword_clash,@raw/car_start"
+    tools:keep="@drawable/*,@raw/slow_spring_board,@raw/aircraft_seatbelt,@raw/sword_clash,@raw/car_start,@raw/keyboard"
 />

android/app/src/main/res/raw/keep.xml

@@ -20,6 +20,19 @@ subprojects {
     }
 }
 
+// Needed for sendbird_chat 4.2.26 to build with no namespace issues
+subprojects {
+    afterEvaluate { project ->
+        if (project.plugins.hasPlugin("com.android.library")) {
+            project.android {
+                if (namespace == null) {
+                    namespace project.group
+                }
+            }
+        }
+    }
+}
+
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }

android/app/src/main/res/raw/keyboard.mp3

@@ -21,7 +21,7 @@ plugins {
     id "com.android.application" version '8.7.0' apply false
     id "org.jetbrains.kotlin.android" version "1.9.20" apply false
     id "com.google.gms.google-services" version "4.4.1" apply false
-    id "com.google.firebase.crashlytics" version "2.9.9" apply false
+    id "com.google.firebase.crashlytics" version "3.0.0" apply false
 }
 
 include ":app"

android/build.gradle

@@ -0,0 +1,20 @@
+targets:
+  $default:
+    sources:
+      - $package$
+      - lib/$lib$
+      - pubspec.yaml
+      - lib/models/api_v2/**
+      - lib/models/api_v2/swagger/**
+    builders:
+      chopper_generator:
+        options:
+          header: "//Generated code"
+      swagger_dart_code_generator:
+        options:
+          input_folder: "lib/models/api_v2/swagger/"
+          output_folder: "lib/models/api_v2/"
+          type_mappings:
+            "ForumId": "int"
+
+