From f7f88e4dd6634d65e18dce847fabaa662368de1d Mon Sep 17 00:00:00 2001
From: Michael Gordeev <michael.xfox@outlook.com>
Date: Fri, 27 Dec 2019 14:27:32 +0300
Subject: [PATCH] Fixed crashes due to calendar compat issues, fixed crashes
 due to image inflatation error (image replaced by text), fixed main layout
 margin

---
 GUT.Schedule/GUT.Schedule/Calendar.cs                |  4 +---
 .../GUT.Schedule/Resources/layout/activity_main.xml  | 11 ++++-------
 .../GUT.Schedule/Resources/layout/splash_screen.xml  | 12 ++++++++++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/GUT.Schedule/GUT.Schedule/Calendar.cs b/GUT.Schedule/GUT.Schedule/Calendar.cs
index 3b1a7b7..b79ebe7 100644
--- a/GUT.Schedule/GUT.Schedule/Calendar.cs
+++ b/GUT.Schedule/GUT.Schedule/Calendar.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using Android.App;
 using Android.Database;
 using Android.Net;
@@ -34,7 +33,7 @@ namespace GUT.Schedule
             };
 
             // Retrieving calendars data
-            ICursor cursor = Application.Context.ContentResolver.Query(calendarsUri, calendarsProjection, null, null);
+            ICursor cursor = Application.Context.ContentResolver.Query(calendarsUri, calendarsProjection, string.Empty, null, string.Empty);
 
             cursor.MoveToNext();
             for (int i = 0; i < cursor.Count; i++)
@@ -44,7 +43,6 @@ namespace GUT.Schedule
                 cursor.MoveToNext();
             }
         }
-
         
         public static  void Export(IEnumerable<Subject> schedule)
         {
diff --git a/GUT.Schedule/GUT.Schedule/Resources/layout/activity_main.xml b/GUT.Schedule/GUT.Schedule/Resources/layout/activity_main.xml
index 7de7661..d1f7a2d 100644
--- a/GUT.Schedule/GUT.Schedule/Resources/layout/activity_main.xml
+++ b/GUT.Schedule/GUT.Schedule/Resources/layout/activity_main.xml
@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    android:paddingBottom="50dp">
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
     
     <LinearLayout
         android:layout_width="match_parent"
@@ -164,8 +163,7 @@
             android:textColor="#FF0000"
             android:text="Error"
             android:layout_marginVertical="5dp"
-            android:visibility="gone"
-        />
+            android:visibility="gone"/>
 
         <Button
             android:id="@+id/export"
@@ -176,8 +174,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="©2019 Михаил Гордеев ИКСС, ИКТ-907"/>
-
+            android:text="©2019 Михаил Гордеев ИКСС, ИКТ-907"
+            android:layout_marginBottom="50dp"/>
     </LinearLayout>
-    
 </ScrollView>
\ No newline at end of file
diff --git a/GUT.Schedule/GUT.Schedule/Resources/layout/splash_screen.xml b/GUT.Schedule/GUT.Schedule/Resources/layout/splash_screen.xml
index 4590e35..1034fd9 100644
--- a/GUT.Schedule/GUT.Schedule/Resources/layout/splash_screen.xml
+++ b/GUT.Schedule/GUT.Schedule/Resources/layout/splash_screen.xml
@@ -10,11 +10,19 @@
         android:orientation="vertical"
         android:layout_centerInParent="true">
 
-        <ImageView
+        <!--<ImageView
             android:layout_width="150dp"
             android:layout_height="150dp"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/logo"/>
+            android:src="@drawable/logo"/>-->
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="ГУТ.Расписание"
+            android:textColor="#ffffff"
+            android:layout_gravity="center_horizontal"
+            android:textSize="36dp"/>
 
         <ProgressBar
             android:layout_width="50dp"