diff --git a/android/app/src/main/kotlin/com/example/tiny_computer/Signal9Activity.kt b/android/app/src/main/kotlin/com/example/tiny_computer/Signal9Activity.kt index e712ef0..59b7fac 100644 --- a/android/app/src/main/kotlin/com/example/tiny_computer/Signal9Activity.kt +++ b/android/app/src/main/kotlin/com/example/tiny_computer/Signal9Activity.kt @@ -39,10 +39,8 @@ class Signal9Activity : AppCompatActivity() { val scrollView = ScrollView(this).apply { layoutParams = LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, - 0 - ).apply { - weight = 1f - } + LinearLayout.LayoutParams.MATCH_PARENT + ) } val fullScreen = LinearLayout(this).apply { @@ -51,6 +49,7 @@ class Signal9Activity : AppCompatActivity() { LinearLayout.LayoutParams.MATCH_PARENT ) orientation = LinearLayout.VERTICAL + setBackgroundColor(Color.parseColor("#4A148C")) } val text1 = TextView(this).apply { diff --git a/lib/workflow.dart b/lib/workflow.dart index e25b4ad..a70a066 100644 --- a/lib/workflow.dart +++ b/lib/workflow.dart @@ -39,6 +39,7 @@ import 'package:permission_handler/permission_handler.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wakelock_plus/wakelock_plus.dart'; +import 'package:device_info_plus/device_info_plus.dart'; class Util { @@ -670,6 +671,7 @@ done final String h = (min(s.width, s.height) * 0.75).round().toString(); G.postCommand = """sed -i -E "s@(geometry)=.*@\\1=${w}x${h}@" /etc/tigervnc/vncserver-config-tmoe sed -i -E "s@^(VNC_RESOLUTION)=.*@\\1=${w}x${h}@" \$(command -v startvnc)"""; + await G.prefs.setBool("getifaddrsBridge", (await DeviceInfoPlugin().androidInfo).version.sdkInt >= 31); } G.currentContainer = Util.getGlobal("defaultContainer") as int; diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 0a41b4e..bfa0c1c 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,6 +5,7 @@ import FlutterMacOS import Foundation +import device_info_plus import dynamic_color import ffmpeg_kit_flutter_full_gpl import network_info_plus @@ -15,6 +16,7 @@ import url_launcher_macos import wakelock_plus func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin")) FFmpegKitFlutterPlugin.register(with: registry.registrar(forPlugin: "FFmpegKitFlutterPlugin")) NetworkInfoPlusPlugin.register(with: registry.registrar(forPlugin: "NetworkInfoPlusPlugin")) diff --git a/pubspec.lock b/pubspec.lock index 6686da8..5ef19b7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -73,6 +73,22 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.10" + device_info_plus: + dependency: "direct main" + description: + name: device_info_plus + sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 + url: "https://pub.dev" + source: hosted + version: "10.1.2" + device_info_plus_platform_interface: + dependency: transitive + description: + name: device_info_plus_platform_interface + sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" + url: "https://pub.dev" + source: hosted + version: "7.0.1" dynamic_color: dependency: "direct main" description: @@ -693,6 +709,14 @@ packages: url: "https://pub.dev" source: hosted version: "5.5.3" + win32_registry: + dependency: transitive + description: + name: win32_registry + sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6" + url: "https://pub.dev" + source: hosted + version: "1.1.4" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7c14750..10bd69e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -46,6 +46,7 @@ dependencies: dynamic_color: ^1.7.0 flutter_speed_dial: ^7.0.0 network_info_plus: ^6.0.0 + device_info_plus: ^10.1.2 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons.