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

- Updated schedule parser

Browse Source 
- Authorization via personal cabinet is temporarly disabled
- Updated target Android version
This commit is contained in:
Michael Gordeev
2020-08-30 09:06:41 +03:00
parent ebdafc273f
commit 634804cbdc
12 changed files with 231 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs
+1 -1
View File
@@ -81,7 +81,7 @@ namespace GUTSchedule.Droid.Activities
start.Text = startDate.ToShortDateString();
groupTitle.Checked = prefs.GetBoolean("AddGroupToHeader", false);
authorize.Checked = prefs.GetBoolean("Authorize", true);
//authorize.Checked = prefs.GetBoolean("Authorize", true);
email.Text = prefs.GetString("email", "");
password.Text = prefs.GetString("password", "");
GUT.Schedule/GUTSchedule.Droid/Properties/AndroidManifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="0-development-test" package="com.xfox111.gut.schedule" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" />
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/appName" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme.Light"></application>
<uses-permission android:name="android.permission.READ_CALENDAR" />
<uses-permission android:name="android.permission.WRITE_CALENDAR" />
GUT.Schedule/GUTSchedule.Droid/Resources/layout/Main.xml
+201 -198
View File
@@ -1,231 +1,234 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/AppTheme.Light">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp">
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/AppTheme.Light">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scheduleParametersTitle"
android:textStyle="bold"
android:textSize="16dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp">
<CheckBox
android:id="@+id/authorization"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/authorizeCheckbox"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scheduleParametersTitle"
android:textStyle="bold"
android:textSize="16dp"/>
<LinearLayout
android:id="@+id/studentParams"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<CheckBox
android:id="@+id/authorization"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:enabled="false"
android:checked="false"
android:text="@string/authorizeCheckbox"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/facultySpinner"/>
<LinearLayout
android:id="@+id/studentParams"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<Spinner
android:id="@+id/faculty"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/facultySpinner"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/courseSpinner"/>
<Spinner
android:id="@+id/faculty"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<Spinner
android:id="@+id/course"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/courseSpinner"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/groupSpinner"/>
<Spinner
android:id="@+id/course"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<Spinner
android:id="@+id/group"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/groupSpinner"/>
<LinearLayout
android:id="@+id/professorParams"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<Spinner
android:id="@+id/group"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="E-mail"/>
<LinearLayout
android:id="@+id/professorParams"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<EditText
android:id="@+id/email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textWebEmailAddress"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="E-mail"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/passwordField"/>
<EditText
android:id="@+id/email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textWebEmailAddress"/>
<EditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textWebPassword"/>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/passwordField"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/exportParametersTitle"
android:textStyle="bold"
android:textSize="16dp"/>
<EditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textWebPassword"/>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dateRange"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/exportParametersTitle"
android:textStyle="bold"
android:textSize="16dp"/>
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stretchColumns="*"
android:shrinkColumns="*">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dateRange"/>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
android:id="@+id/start"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="20-Dec-2019"/>
<Button
android:id="@+id/end"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="31-Dec-2019"/>
</TableRow>
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stretchColumns="*"
android:shrinkColumns="*">
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp">
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:id="@+id/forDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/forDayButton"/>
<Button
android:id="@+id/forWeek"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/forWeekButton"/>
</LinearLayout>
<Button
android:id="@+id/start"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="20-Dec-2019"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:id="@+id/forMonth"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/forMonthButton"/>
<Button
android:id="@+id/forSemester"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/forSemesterButton"/>
</LinearLayout>
</TableRow>
</TableLayout>
<Button
android:id="@+id/end"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="31-Dec-2019"/>
</TableRow>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/reminderSpinner"/>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp">
<Spinner
android:id="@+id/reminder"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/reminderNote"/>
<Button
android:id="@+id/forDay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/forDayButton"/>
<Button
android:id="@+id/forWeek"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/forWeekButton"/>
</LinearLayout>
<CheckBox
android:id="@+id/groupTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/addGroupToTitleCheckbox"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/titleNote"/>
<Button
android:id="@+id/forMonth"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/forMonthButton"/>
<Button
android:id="@+id/forSemester"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/forSemesterButton"/>
</LinearLayout>
</TableRow>
</TableLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/destinationCalendarSpinner"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/reminderSpinner"/>
<Spinner
android:id="@+id/calendar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<Spinner
android:id="@+id/reminder"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/error"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#FF0000"
android:text="Error"
android:layout_marginVertical="5dp"
android:visibility="gone"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/reminderNote"/>
<Button
android:id="@+id/export"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/addScheduleButton"/>
<CheckBox
android:id="@+id/groupTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/addGroupToTitleCheckbox"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/copyrights"/>
<TextView
android:id="@+id/version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="v$(Build.BuildNumber) (ci-id #$(Build.BuildId))"/>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/titleNote"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/destinationCalendarSpinner"/>
<Spinner
android:id="@+id/calendar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/error"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#FF0000"
android:text="Error"
android:layout_marginVertical="5dp"
android:visibility="gone"/>
<Button
android:id="@+id/export"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/addScheduleButton"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/copyrights"/>
<TextView
android:id="@+id/version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="v$(Build.BuildNumber) (ci-id #$(Build.BuildId))"/>
</LinearLayout>
</ScrollView>