From 32c97aa6cfff2bc973e03da544f6d7d82427b3c3 Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Mon, 23 Dec 2019 12:21:46 +0300 Subject: [PATCH] Added icons, repository and code cleanup --- .../GUT.Schedule/Activities/ExportActivity.cs | 2 +- .../GUT.Schedule/Activities/MainActivity.cs | 31 +- .../GUT.Schedule/Activities/StartActivity.cs | 2 +- GUT.Schedule/GUT.Schedule/Calendar.cs | 5 +- .../Fragments/DatePickerFragment.cs | 9 +- GUT.Schedule/GUT.Schedule/GUT.Schedule.csproj | 7 +- GUT.Schedule/GUT.Schedule/Models/DataSet.cs | 12 + GUT.Schedule/GUT.Schedule/Parser.cs | 24 +- .../Resources/Resource.designer.cs | 452 +++++++++--------- .../GUT.Schedule/Resources/drawable/logo.png | Bin 0 -> 131916 bytes .../Resources/layout/activity_main.xml | 34 +- .../Resources/layout/export_progress.xml | 5 +- .../Resources/layout/splash_screen.xml | 10 +- .../GUT.Schedule/Resources/menu/menu_main.xml | 4 + .../Resources/mipmap-hdpi/ic_launcher.png | Bin 1634 -> 5166 bytes .../mipmap-hdpi/ic_launcher_foreground.png | Bin 1441 -> 3080 bytes .../mipmap-hdpi/ic_launcher_round.png | Bin 3552 -> 7620 bytes .../Resources/mipmap-mdpi/ic_launcher.png | Bin 1362 -> 2674 bytes .../mipmap-mdpi/ic_launcher_foreground.png | Bin 958 -> 1593 bytes .../mipmap-mdpi/ic_launcher_round.png | Bin 2413 -> 3962 bytes .../Resources/mipmap-xhdpi/ic_launcher.png | Bin 2307 -> 7256 bytes .../mipmap-xhdpi/ic_launcher_foreground.png | Bin 2056 -> 4273 bytes .../mipmap-xhdpi/ic_launcher_round.png | Bin 4858 -> 10725 bytes .../Resources/mipmap-xxhdpi/ic_launcher.png | Bin 3871 -> 14334 bytes .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 3403 -> 8128 bytes .../mipmap-xxhdpi/ic_launcher_round.png | Bin 8001 -> 21092 bytes .../Resources/mipmap-xxxhdpi/ic_launcher.png | Bin 5016 -> 21003 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 4889 -> 10885 bytes .../mipmap-xxxhdpi/ic_launcher_round.png | Bin 10893 -> 29567 bytes 29 files changed, 347 insertions(+), 250 deletions(-) create mode 100644 GUT.Schedule/GUT.Schedule/Models/DataSet.cs create mode 100644 GUT.Schedule/GUT.Schedule/Resources/drawable/logo.png diff --git a/GUT.Schedule/GUT.Schedule/Activities/ExportActivity.cs b/GUT.Schedule/GUT.Schedule/Activities/ExportActivity.cs index 7a92734..a61598d 100644 --- a/GUT.Schedule/GUT.Schedule/Activities/ExportActivity.cs +++ b/GUT.Schedule/GUT.Schedule/Activities/ExportActivity.cs @@ -10,7 +10,7 @@ namespace GUT.Schedule /// /// Shows status of schedule export process /// - [Activity(Theme = "@style/AppTheme.NoActionBar")] + [Activity] 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 7e30e97..00db56d 100644 --- a/GUT.Schedule/GUT.Schedule/Activities/MainActivity.cs +++ b/GUT.Schedule/GUT.Schedule/Activities/MainActivity.cs @@ -14,6 +14,7 @@ namespace GUT.Schedule public class MainActivity : AppCompatActivity { Button start, end, export; + Button forDay, forWeek, forMonth, forSemester; Spinner faculty, course, group, reminder, calendar; CheckBox groupTitle; TextView error; @@ -93,6 +94,12 @@ namespace GUT.Schedule group.SetList(this, Data.Groups.Select(i => i.Name)); } + private void SetDate(int days) + { + Data.EndDate = Data.StartDate.AddDays(days); + end.Text = Data.EndDate.ToShortDateString(); + } + #region Init stuff private void AssignVariables() { @@ -100,6 +107,11 @@ namespace GUT.Schedule end = FindViewById