Merge branch 'feature/android-sdk-35' into develop

Author: lucien144

android/app/build.gradle

@@ -32,8 +32,9 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 34
-    android.ndkVersion '21.4.7075529'
+    namespace 'net.lucien144.fyx'
+    compileSdkVersion 35
+    android.ndkVersion '27.0.12077973'
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
@@ -46,7 +47,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId 'net.lucien144.fyx'
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         //multiDexEnabled true // Uncomment for dev
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

android/build.gradle

@@ -1,7 +1,7 @@
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -15,4 +15,4 @@ subprojects {
 
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
-}
+}

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 rl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0" // apply true
-    id "com.android.application" version "7.2.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.22" apply false
+    id "com.android.application" version "8.7.3" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
     id "com.google.gms.google-services" version "4.3.15" apply false
     id "com.google.firebase.firebase-perf" version "1.4.1" apply false
     id "com.google.firebase.crashlytics" version "2.8.1" apply false

ios/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - app_links (6.4.1):
+  - app_links (0.0.2):
     - Flutter
   - device_info (0.0.1):
     - Flutter
@@ -312,7 +312,7 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
 
 SPEC CHECKSUMS:
-  app_links: 585674be3c6661708e6cd794ab4f39fb9d8356f9
+  app_links: e7a6750a915a9e161c58d91bc610e8cd1d4d0ad0
   device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
   Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2
   firebase_analytics: 4b8609ce8d2e0c8928472bec8d9753a8f1835eb6

lib/FyxApp.dart

@@ -41,7 +41,7 @@ import 'package:fyx/theme/skin/skins/ForestSkin.dart';
 import 'package:fyx/theme/skin/skins/FyxSkin.dart';
 import 'package:fyx/theme/skin/skins/GreyMatterSkin.dart';
 import 'package:fyx/theme/skin/skins/dark_skin.dart';
-import 'package:package_info/package_info.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:tap_canvas/tap_canvas.dart';

lib/libs/DeviceInfo.dart

@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:device_info/device_info.dart';
+import 'package:device_info_plus/device_info_plus.dart';
 
 class DeviceInfo {
   late String systemName;

lib/model/MainRepository.dart

@@ -2,7 +2,7 @@ import 'package:fyx/controllers/NotificationsService.dart';
 import 'package:fyx/controllers/SettingsProvider.dart';
 import 'package:fyx/libs/DeviceInfo.dart';
 import 'package:fyx/model/Credentials.dart';
-import 'package:package_info/package_info.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 class MainRepository {
   // TODO: Refactor -> rename MainRepository to AppContext?

lib/pages/GalleryPage.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:device_info/device_info.dart';
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:fyx/components/post/post_hero_attachment.dart';

lib/pages/discussion_home_page.dart

@@ -19,9 +19,8 @@ class DiscussionHomePageArguments {
 
 class DiscussionHomePage extends StatelessWidget {
   final bool header;
-  DiscussionHomePage({Key? key, this.header = false}) : super(key: key) {
-    if (Platform.isAndroid) WebView.platform = SurfaceAndroidWebView();
-  }
+
+  DiscussionHomePage({Key? key, this.header = false}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -50,9 +49,11 @@ class DiscussionHomePage extends StatelessWidget {
               </body>
               </html>
 ''';
-                final String contentBase64 = base64Encode(const Utf8Encoder().convert(html));
-                return WebView(
-                  initialUrl: 'data:text/html;base64,$contentBase64',
+                final controller = WebViewController()
+                  ..setJavaScriptMode(JavaScriptMode.unrestricted)
+                  ..loadHtmlString(html);
+                return WebViewWidget(
+                  controller: controller,
                 );
               }
               return T.feedbackScreen(context, isLoading: true);