From d75c85128028c1ebe4f8b9d23ecd6c77a61a8716 Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Wed, 5 Feb 2020 17:50:43 +0300 Subject: [PATCH] Replaced about dialog with about page Updated Layout files names to match codestyle rules --- .../GUT.Schedule/Activities/AboutActivity.cs | 87 +++ .../GUT.Schedule/Activities/ExportActivity.cs | 4 +- .../GUT.Schedule/Activities/MainActivity.cs | 15 +- .../GUT.Schedule/Activities/StartActivity.cs | 4 +- GUT.Schedule/GUT.Schedule/Assets/About.html | 21 - GUT.Schedule/GUT.Schedule/GUT.Schedule.csproj | 24 +- .../Resources/Resource.designer.cs | 514 +++++++++--------- .../GUT.Schedule/Resources/layout/About.xml | 102 ++++ .../{export_progress.xml => Export.xml} | 0 .../layout/{activity_main.xml => Main.xml} | 2 +- .../{splash_screen.xml => SplashScreen.xml} | 0 11 files changed, 481 insertions(+), 292 deletions(-) create mode 100644 GUT.Schedule/GUT.Schedule/Activities/AboutActivity.cs delete mode 100644 GUT.Schedule/GUT.Schedule/Assets/About.html create mode 100644 GUT.Schedule/GUT.Schedule/Resources/layout/About.xml rename GUT.Schedule/GUT.Schedule/Resources/layout/{export_progress.xml => Export.xml} (100%) rename GUT.Schedule/GUT.Schedule/Resources/layout/{activity_main.xml => Main.xml} (99%) rename GUT.Schedule/GUT.Schedule/Resources/layout/{splash_screen.xml => SplashScreen.xml} (100%) diff --git a/GUT.Schedule/GUT.Schedule/Activities/AboutActivity.cs b/GUT.Schedule/GUT.Schedule/Activities/AboutActivity.cs new file mode 100644 index 0000000..b34c74c --- /dev/null +++ b/GUT.Schedule/GUT.Schedule/Activities/AboutActivity.cs @@ -0,0 +1,87 @@ +using Android.App; +using Android.Content; +using Android.Content.PM; +using Android.OS; +using Android.Support.V4.Text; +using Android.Support.V7.App; +using Android.Text.Method; +using Android.Widget; +using Newtonsoft.Json; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Net.Http.Headers; + +namespace GUT.Schedule.Activities +{ + [Activity(Label = "О приложениии")] + public class AboutActivity : AppCompatActivity + { + private readonly (string name, string handle, string link)[] contacts = new (string, string, string)[] + { + ("Веб-сайт", "https://xfox111.net", "https://xfox111.net"), + ("Twitter", "@xfox111", "https://twitter.com/xfox111"), + ("ВКонтакте", "@xfox.mike", "https://vk.com/xfox.mike"), + ("LinkedIn", "@xfox", "https://linkedin.com/in/xfox"), + ("GitHub", "@xfox111", "https://github.com/xfox111"), + }; + private readonly (string name, string link)[] links = new (string, string)[] + { + ("Политика конфиденциальности", "https://xfox111.net/Projects/GUTSchedule/PrivacyPolicy.txt"), + ("General Public License v3", "https://www.gnu.org/licenses/gpl-3.0"), + ("Репозиторий GitHub", "https://github.com/xfox111/gutschedule"), + ("НОЦ \"ТИОС\"", "http://tios.spbgut.ru/index.php"), + ("СПбГУТ", "https://sut.ru"), + }; + + protected override async void OnCreate(Bundle savedInstanceState) + { + base.OnCreate(savedInstanceState); + SetContentView(Resource.Layout.About); + PackageInfo version = PackageManager.GetPackageInfo(PackageName, PackageInfoFlags.MatchAll); + FindViewById(Resource.Id.version).Text = $"v{version.VersionName} (ci-id #{version.VersionCode})"; + + FindViewById