xfox111/GUTSchedule
1
0
Fork 0
mirror of https://github.com/XFox111/GUTSchedule.git synced 2026-04-22 06:58:01 +03:00
Code Activity

Fixed crashes due to calendar compat issues, fixed crashes due to image inflatation error (image replaced by text), fixed main layout margin

Browse Source
This commit is contained in:
Michael Gordeev
2019-12-27 14:27:32 +03:00
parent 4f14e9f16b
commit f7f88e4dd6
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GUT.Schedule/GUT.Schedule/Calendar.cs
+1 -3
View File
@@ -1,5 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks;
using Android.App; using Android.App;
using Android.Database; using Android.Database;
using Android.Net; using Android.Net;
@@ -34,7 +33,7 @@ namespace GUT.Schedule
}; };
// Retrieving calendars data // 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(); cursor.MoveToNext();
for (int i = 0; i < cursor.Count; i++) for (int i = 0; i < cursor.Count; i++)
@@ -45,7 +44,6 @@ namespace GUT.Schedule
} }
} }
public static void Export(IEnumerable<Subject> schedule) public static void Export(IEnumerable<Subject> schedule)
{ {
DataSet data = Data.DataSet; DataSet data = Data.DataSet;
GUT.Schedule/GUT.Schedule/Resources/layout/activity_main.xml
+4 -7
View File
@@ -4,8 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior">
android:paddingBottom="50dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -164,8 +163,7 @@
android:textColor="#FF0000" android:textColor="#FF0000"
android:text="Error" android:text="Error"
android:layout_marginVertical="5dp" android:layout_marginVertical="5dp"
android:visibility="gone" android:visibility="gone"/>
/>
<Button <Button
android:id="@+id/export" android:id="@+id/export"
@@ -176,8 +174,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="©2019 Михаил Гордеев ИКСС, ИКТ-907"/> android:text="©2019 Михаил Гордеев ИКСС, ИКТ-907"
android:layout_marginBottom="50dp"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
GUT.Schedule/GUT.Schedule/Resources/layout/splash_screen.xml
+10 -2
View File
@@ -10,11 +10,19 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_centerInParent="true"> android:layout_centerInParent="true">
<ImageView <!--<ImageView
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
android:layout_gravity="center_horizontal" 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 <ProgressBar
android:layout_width="50dp" android:layout_width="50dp"