grades ui polishing & sorting fix
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
9
app/src/main/res/drawable/ic_grading_black_24dp.xml
Normal file
9
app/src/main/res/drawable/ic_grading_black_24dp.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M4,7h16v2H4V7zM4,13h16v-2H4V13zM4,17h7v-2H4V17zM4,21h7v-2H4V21zM15.41,18.17L14,16.75l-1.41,1.41L15.41,21L20,16.42L18.58,15L15.41,18.17zM4,3v2h16V3H4z"
|
||||
android:fillColor="#000000"/>
|
||||
</vector>
|
||||
@ -10,6 +10,7 @@
|
||||
android:paddingBottom="3dp">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linLayout_subject"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
@ -19,23 +20,51 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Mathematik 1"
|
||||
android:text="@string/sample_subject"
|
||||
android:textSize="15sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtView_grade"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:text="2,0"
|
||||
android:text="@string/sample_grade"
|
||||
android:textAlignment="textEnd"
|
||||
android:textSize="15sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linLayout_sub_subject"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:paddingStart="7dp"
|
||||
android:paddingTop="3dp"
|
||||
android:paddingEnd="0dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtView_sub_subject"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/sample_sub_subject" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtView_sub_grade"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/sample_grade_state"
|
||||
android:textAlignment="textEnd" />
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:id="@+id/divider_grades"
|
||||
android:id="@+id/divider_grade"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginTop="2dp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:background="?dividerColor" />
|
||||
</LinearLayout>
|
||||
|
||||
@ -36,22 +36,22 @@
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtView_Grades"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/grades_heading"
|
||||
android:textAlignment="center"
|
||||
android:textSize="26sp"
|
||||
android:textStyle="bold" />
|
||||
android:id="@+id/txtView_Grades"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/login_heading"
|
||||
android:textAlignment="center"
|
||||
android:textSize="26sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtView_GradesDesc"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="7dp"
|
||||
android:text="@string/grades_desc_on"
|
||||
android:textAlignment="center"
|
||||
android:textSize="18sp" />
|
||||
android:id="@+id/txtView_GradesDesc"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="7dp"
|
||||
android:text="@string/login_desc_on"
|
||||
android:textAlignment="center"
|
||||
android:textSize="18sp" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/editText_email"
|
||||
|
||||
@ -65,7 +65,7 @@
|
||||
android:id="@+id/txtView_UserDesc"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/user" />
|
||||
android:text="@string/user_desc" />
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
android:title="@string/moodle"/>
|
||||
<item
|
||||
android:id="@+id/nav_grades"
|
||||
android:icon="@drawable/icon_checkmark_black"
|
||||
android:icon="@drawable/ic_grading_black_24dp"
|
||||
android:title="@string/grades" />
|
||||
<item
|
||||
android:id="@+id/nav_settings"
|
||||
|
||||
@ -19,8 +19,8 @@
|
||||
<string name="get_started">los geht\'s</string>
|
||||
<string name="course_heading">Studiengang</string>
|
||||
<string name="course_desc_on">Wähle deinen aktuellen Studiengang.\nZusätzliche Vorlesungen können später hinzugefügt werden.</string>
|
||||
<string name="grades_heading">Noten</string>
|
||||
<string name="grades_desc_on">Project Laogai kann auf die Notenverwaltung zugreifen. Deine Login-Daten werden verschlüsselt auf deinem Gerät gespeichert. Diese Funktion wird "as is" und ohne Garantie bereitgestellt.</string>
|
||||
<string name="login_heading">Login</string>
|
||||
<string name="login_desc_on">Project Laogai kann auf die Notenverwaltung zugreifen. Deine Login-Daten werden verschlüsselt auf deinem Gerät gespeichert. Diese Funktion wird "as is" und ohne Garantie bereitgestellt.</string>
|
||||
<string name="email">E-Mail</string>
|
||||
<string name="password">Passwort</string>
|
||||
<string name="login">login</string>
|
||||
@ -41,10 +41,12 @@
|
||||
|
||||
<!-- fragment_grades -->
|
||||
<string name="loading_from_hs">Lade Daten von den Hochschul Servern.\nDas kann eine Weile dauern.</string>
|
||||
<string name="credentials_missing">Diese Funktion benötigt deine Login-Daten. Bitte logge dich über die Einstellungen ein.</string>
|
||||
<string name="without_guarantee">Alle Angaben ohne Gewähr.</string>
|
||||
|
||||
<!-- fragment_settings -->
|
||||
<string name="info">Info</string>
|
||||
<string name="user">Benutzer</string>
|
||||
<string name="user_desc">Zum bearbeiten tippen</string>
|
||||
<string name="course_desc">Tippe um den Kurs zu ändern</string>
|
||||
<string name="manage_lessons">Bearbeite Zusätzliche Vorlesungen</string>
|
||||
<string name="manage_lessons_desc">Tippe um zusätzliche Vorlesungen zu bearbeiten</string>
|
||||
|
||||
@ -21,8 +21,8 @@
|
||||
<string name="get_started">get started</string>
|
||||
<string name="course_heading">Course</string>
|
||||
<string name="course_desc_on">Select your current course.\nAdditional lessons can be added later.</string>
|
||||
<string name="grades_heading">Grades</string>
|
||||
<string name="grades_desc_on">Project Laogai can connect to the HIS Online-Portal. Your Login-Data will be stored encrypted on your device. This feature is provided "as is", without any warranty.</string>
|
||||
<string name="login_heading">Login</string>
|
||||
<string name="login_desc_on">Project Laogai can connect to the HIS Online-Portal. Your Login-Data will be stored encrypted on your device. This feature is provided "as is", without any guarantee.</string>
|
||||
<string name="email">E-Mail</string>
|
||||
<string name="password">Password</string>
|
||||
<string name="login">login</string>
|
||||
@ -43,10 +43,12 @@
|
||||
|
||||
<!-- fragment_grades -->
|
||||
<string name="loading_from_hs">Loading data from the university servers.\nThis may take a while.</string>
|
||||
<string name="credentials_missing">This feature needs your Login-Data to work. Please login via the settings.</string>
|
||||
<string name="without_guarantee">All information is supplied without guarantee.</string>
|
||||
|
||||
<!-- fragment_settings -->
|
||||
<string name="info">Info</string>
|
||||
<string name="user">User</string>
|
||||
<string name="user_desc">Tap to edit</string>
|
||||
<string name="course_desc">Tap to change course</string>
|
||||
<string name="manage_lessons">Manage Additional Lessons</string>
|
||||
<string name="manage_lessons_desc">Tap to manage additional lessons</string>
|
||||
@ -79,8 +81,12 @@
|
||||
|
||||
<!-- sample strings -->
|
||||
<string name="sample_user" translatable="false">spinefield@stud.hs-offenburg.de</string>
|
||||
<string name="sample_course" translatable="false">SampleCourse 3</string>
|
||||
<string name="sample_date" translatable="false">Montag, 30.02</string>
|
||||
<string name="sample_course" translatable="false">Everything</string>
|
||||
<string name="sample_subject" translatable="false">Earthbending</string>
|
||||
<string name="sample_sub_subject" translatable="false">Applied Earthbending</string>
|
||||
<string name="sample_grade" translatable="false">1,0</string>
|
||||
<string name="sample_grade_state" translatable="false">passed</string>
|
||||
<string name="sample_date" translatable="false">Monday, 30.02</string>
|
||||
<string name="a_time" translatable="false">0.00 – 23.59</string>
|
||||
|
||||
<!-- errors -->
|
||||
|
||||
Reference in New Issue
Block a user