diff --git a/.metadata b/.metadata
index aa7708c2..24a13c13 100644
--- a/.metadata
+++ b/.metadata
@@ -1,11 +1,11 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
-# This file should be version controlled.
+# This file should be version controlled and should not be manually edited.
version:
- revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
- channel: stable
+ revision: "bae5e49bc2a867403c43b2aae2de8f8c33b037e4"
+ channel: "stable"
project_type: app
@@ -13,11 +13,26 @@ project_type: app
migration:
platforms:
- platform: root
- create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
- base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
+ create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+ base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+ - platform: android
+ create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+ base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+ - platform: ios
+ create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+ base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+ - platform: linux
+ create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+ base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
- platform: macos
- create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
- base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
+ create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+ base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+ - platform: web
+ create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+ base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+ - platform: windows
+ create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+ base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
# User provided section
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 55191d7f..f12f8d0a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,3 +1,9 @@
+plugins {
+ id "com.android.application"
+ id "kotlin-android"
+ id "dev.flutter.flutter-gradle-plugin"
+}
+
def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
@@ -12,11 +18,6 @@ if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
@@ -27,12 +28,10 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
android {
- compileSdkVersion 34
+ namespace "tech.lolli.toolbox"
+ compileSdk flutter.compileSdkVersion
+ ndkVersion flutter.ndkVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -48,9 +47,12 @@ android {
}
defaultConfig {
- applicationId "tech.lolli.toolbox"
- minSdkVersion 21
- targetSdkVersion 30
+ // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+ applicationId "com.lollipopkit.flutter_server_box"
+ // You can update the following values to match your application needs.
+ // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+ minSdkVersion flutter.minSdkVersion
+ targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
@@ -83,13 +85,10 @@ android {
applicationIdSuffix '.debug'
}
}
- namespace 'tech.lolli.toolbox'
}
flutter {
source '../..'
}
-dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
+dependencies {}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index be725c75..fd12a376 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,12 +10,14 @@
+
+
+
+
+
+
+
diff --git a/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java b/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
new file mode 100644
index 00000000..752fc185
--- /dev/null
+++ b/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
@@ -0,0 +1,25 @@
+// Generated file.
+//
+// If you wish to remove Flutter's multidex support, delete this entire file.
+//
+// Modifications to this file should be done in a copy under a different name
+// as this file may be regenerated.
+
+package io.flutter.app;
+
+import android.app.Application;
+import android.content.Context;
+import androidx.annotation.CallSuper;
+import androidx.multidex.MultiDex;
+
+/**
+ * Extension of {@link android.app.Application}, adding multidex support.
+ */
+public class FlutterMultiDexApplication extends Application {
+ @Override
+ @CallSuper
+ protected void attachBaseContext(Context base) {
+ super.attachBaseContext(base);
+ MultiDex.install(this);
+ }
+}
diff --git a/android/build.gradle b/android/build.gradle
index 20d5eff7..bc157bd1 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,16 +1,3 @@
-buildscript {
- ext.kotlin_version = '1.8.10'
- repositories {
- google()
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:7.4.2'
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- }
-}
-
allprojects {
repositories {
google()
@@ -21,6 +8,8 @@ allprojects {
rootProject.buildDir = '../build'
subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
project.evaluationDependsOn(':app')
}
diff --git a/android/gradle.properties b/android/gradle.properties
index d50f7591..598d13fe 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 02e5f581..e1ca574e 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index 44e62bcf..767b939b 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,11 +1,26 @@
-include ':app'
+pluginManagement {
+ def flutterSdkPath = {
+ def properties = new Properties()
+ file("local.properties").withInputStream { properties.load(it) }
+ def flutterSdkPath = properties.getProperty("flutter.sdk")
+ assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+ return flutterSdkPath
+ }
+ settings.ext.flutterSdkPath = flutterSdkPath()
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+ includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+ repositories {
+ google()
+ mavenCentral()
+ gradlePluginPortal()
+ }
+}
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+ id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+ id "com.android.application" version "7.3.0" apply false
+ id "org.jetbrains.kotlin.android" version "1.8.10" apply false
+}
+
+include ":app"
diff --git a/lib/view/page/ssh/page.dart b/lib/view/page/ssh/page.dart
index 2718e562..100702e3 100644
--- a/lib/view/page/ssh/page.dart
+++ b/lib/view/page/ssh/page.dart
@@ -148,7 +148,7 @@ class _SSHPageState extends State with AutomaticKeepAliveClientMixin {
deleteDetection: isMobile,
autofocus: true,
keyboardAppearance: _isDark ? Brightness.dark : Brightness.light,
- hideScrollBar: false,
+ //hideScrollBar: false,
),
),
);
diff --git a/pubspec.lock b/pubspec.lock
index f5a62edb..9460556d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1259,7 +1259,7 @@ packages:
description:
path: "."
ref: master
- resolved-ref: dc27e3c4e967dccdcae2c2efac2cde4e77ea1ff2
+ resolved-ref: aad22a50bf09b2d87b20e2e45c1c9ca5ff0037f7
url: "https://github.com/lollipopkit/xterm.dart"
source: git
version: "3.6.1-pre"