From bb21435faad189f3552757e851ad9fa5c2448a3f Mon Sep 17 00:00:00 2001 From: csf Date: Wed, 13 Apr 2022 13:46:22 +0800 Subject: [PATCH] update UI ; fix android InputService @Keep --- .../kotlin/com/carriez/flutter_hbb/InputService.kt | 10 ++++------ lib/common.dart | 3 ++- lib/models/server_model.dart | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/android/app/src/main/kotlin/com/carriez/flutter_hbb/InputService.kt b/android/app/src/main/kotlin/com/carriez/flutter_hbb/InputService.kt index 568607783..b95fa733a 100644 --- a/android/app/src/main/kotlin/com/carriez/flutter_hbb/InputService.kt +++ b/android/app/src/main/kotlin/com/carriez/flutter_hbb/InputService.kt @@ -7,6 +7,7 @@ import android.graphics.Path import android.os.Build import android.util.Log import android.view.accessibility.AccessibilityEvent +import androidx.annotation.Keep import androidx.annotation.RequiresApi class InputService : AccessibilityService() { @@ -30,6 +31,7 @@ class InputService : AccessibilityService() { private var mouseX = 0 private var mouseY = 0 + @Keep @RequiresApi(Build.VERSION_CODES.N) fun rustMouseInput(mask: Int, _x: Int, _y: Int) { val x = if (_x < 0) { @@ -107,11 +109,7 @@ class InputService : AccessibilityService() { init(this) } - override fun onAccessibilityEvent(event: AccessibilityEvent?) { -// TODO("Not yet implemented") - } + override fun onAccessibilityEvent(event: AccessibilityEvent?) {} - override fun onInterrupt() { -// TODO("Not yet implemented") - } + override fun onInterrupt() {} } diff --git a/lib/common.dart b/lib/common.dart index fc5fdb8ea..d17eeffa5 100644 --- a/lib/common.dart +++ b/lib/common.dart @@ -132,7 +132,8 @@ class CustomAlertDialog extends StatelessWidget { onWillPop: onWillPop ?? () async => false, child: AlertDialog( title: title, - contentPadding: EdgeInsets.all(contentPadding ?? 20), + contentPadding: EdgeInsets.symmetric( + horizontal: contentPadding ?? 25, vertical: 10), content: content, actions: actions, )); diff --git a/lib/models/server_model.dart b/lib/models/server_model.dart index d4579a736..64660d3ba 100644 --- a/lib/models/server_model.dart +++ b/lib/models/server_model.dart @@ -296,9 +296,8 @@ class ServerModel with ChangeNotifier { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text(translate("Do you accept?")), - SizedBox(height: 20), clientInfo(client), - Text(translate("android_new_connection_tip")), + Text(translate("android_new_connection_tip"),style: TextStyle(color: Colors.black54),), ], ), actions: [