From 435ab6e034eb7cedb477e1789a476fb228587bf5 Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Thu, 20 Jan 2022 21:04:21 +0800 Subject: [PATCH] Fixed DebSection #909 & Android ASF Console ScrollToEnd --- .../Extensions/ScrollViewExtensions.cs | 17 +++++++++++++++++ .../ASFPlusConsoleFragment.cs | 1 + src/ST.Tools.Publish/Steps/Step_deb.cs | 3 ++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/ST.Client.Android/Extensions/ScrollViewExtensions.cs diff --git a/src/ST.Client.Android/Extensions/ScrollViewExtensions.cs b/src/ST.Client.Android/Extensions/ScrollViewExtensions.cs new file mode 100644 index 000000000..78c7a52ef --- /dev/null +++ b/src/ST.Client.Android/Extensions/ScrollViewExtensions.cs @@ -0,0 +1,17 @@ +using Android.Views; +using AndroidX.Core.Widget; + +// ReSharper disable once CheckNamespace +namespace System +{ + public static class ScrollViewExtensions + { + public static void ScrollToEnd(this NestedScrollView scrollView) + { + scrollView.Post(() => + { + scrollView.FullScroll((int)FocusSearchDirection.Down); + }); + } + } +} diff --git a/src/ST.Client.Android/UI/Fragments/ArchiSteamFarmPlus/ASFPlusConsoleFragment.cs b/src/ST.Client.Android/UI/Fragments/ArchiSteamFarmPlus/ASFPlusConsoleFragment.cs index 61d05bf9a..c833fa033 100644 --- a/src/ST.Client.Android/UI/Fragments/ArchiSteamFarmPlus/ASFPlusConsoleFragment.cs +++ b/src/ST.Client.Android/UI/Fragments/ArchiSteamFarmPlus/ASFPlusConsoleFragment.cs @@ -29,6 +29,7 @@ namespace System.Application.UI.Fragments { if (binding == null) return; binding.tvConsole.Text = value; + binding.scrollView.ScrollToEnd(); }).AddTo(this); SetConsoleFontSize(ASFSettings.ConsoleFontSize.Value); diff --git a/src/ST.Tools.Publish/Steps/Step_deb.cs b/src/ST.Tools.Publish/Steps/Step_deb.cs index c342b9058..7d4dc3956 100644 --- a/src/ST.Tools.Publish/Steps/Step_deb.cs +++ b/src/ST.Tools.Publish/Steps/Step_deb.cs @@ -126,7 +126,8 @@ namespace System.Application.Steps LinuxPackConstants.InstallService, LinuxPackConstants.ServiceName, LinuxPackConstants.Prefix, - LinuxPackConstants.DebSection, + //LinuxPackConstants.DebSection, + "utils", LinuxPackConstants.DebPriority, LinuxPackConstants.DebHomepage, LinuxPackConstants.PreInstallScript,