diff --git a/GUT.Schedule/GUT.Schedule/Activities/ExportActivity.cs b/GUT.Schedule/GUT.Schedule/Activities/ExportActivity.cs index 2200c97..69e091e 100644 --- a/GUT.Schedule/GUT.Schedule/Activities/ExportActivity.cs +++ b/GUT.Schedule/GUT.Schedule/Activities/ExportActivity.cs @@ -12,7 +12,7 @@ namespace GUT.Schedule /// /// Shows status of schedule export process /// - [Activity] + [Activity(Theme = "@style/AppTheme.Light.SplashScreen")] public class ExportActivity : Activity { TextView status; diff --git a/GUT.Schedule/GUT.Schedule/Activities/MainActivity.cs b/GUT.Schedule/GUT.Schedule/Activities/MainActivity.cs index cd721be..57d43c3 100644 --- a/GUT.Schedule/GUT.Schedule/Activities/MainActivity.cs +++ b/GUT.Schedule/GUT.Schedule/Activities/MainActivity.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Net.Http; using Android.App; using Android.Content; +using Android.Content.PM; using Android.OS; using Android.Preferences; using Android.Support.V4.Text; @@ -17,7 +18,7 @@ using GUT.Schedule.Models; namespace GUT.Schedule { - [Activity(Theme = "@style/AppTheme")] + [Activity] public class MainActivity : AppCompatActivity { Button start, end, export; @@ -34,6 +35,8 @@ namespace GUT.Schedule { base.OnCreate(savedInstanceState); SetContentView(Resource.Layout.activity_main); + PackageInfo version = PackageManager.GetPackageInfo(PackageName, PackageInfoFlags.MatchAll); + FindViewById(Resource.Id.version).Text = $"v{version.VersionName} (ci-id #{version.VersionCode})"; prefs = PreferenceManager.GetDefaultSharedPreferences(this); diff --git a/GUT.Schedule/GUT.Schedule/Activities/StartActivity.cs b/GUT.Schedule/GUT.Schedule/Activities/StartActivity.cs index 2704c99..19b73d7 100644 --- a/GUT.Schedule/GUT.Schedule/Activities/StartActivity.cs +++ b/GUT.Schedule/GUT.Schedule/Activities/StartActivity.cs @@ -17,7 +17,7 @@ namespace GUT.Schedule /// /// Splash screen activity. Loads init data /// - [Activity(MainLauncher = true)] + [Activity(MainLauncher = true, Theme = "@style/AppTheme.Light.SplashScreen")] public class StartActivity : AppCompatActivity { TextView status; @@ -28,6 +28,8 @@ namespace GUT.Schedule base.OnCreate(savedInstanceState); status = FindViewById(Resource.Id.status); + PackageInfo version = PackageManager.GetPackageInfo(PackageName, PackageInfoFlags.MatchAll); + FindViewById(Resource.Id.version).Text = $"v{version.VersionName} (ci-id #{version.VersionCode})"; status.Text = "Проверка наличия разрешений"; diff --git a/GUT.Schedule/GUT.Schedule/GUT.Schedule.csproj b/GUT.Schedule/GUT.Schedule/GUT.Schedule.csproj index 0e14128..0557a1a 100644 --- a/GUT.Schedule/GUT.Schedule/GUT.Schedule.csproj +++ b/GUT.Schedule/GUT.Schedule/GUT.Schedule.csproj @@ -109,8 +109,6 @@ Designer - - @@ -160,6 +158,9 @@ + + +