Changed a few strings, made use of the ViewModels for substitution plan and food menu fragments, fixed a visual bug in the course_card.xml

This commit is contained in:
Deniz Düzgören
2019-09-18 11:12:10 +02:00
parent 797a634da4
commit be810e5bfb
10 changed files with 70 additions and 72 deletions
@@ -28,7 +28,7 @@
android:textAlignment="center"
android:textColor="@color/colorAccent"
android:fontFamily="@font/manrope_extrabold"
android:textSize="24sp"
android:textSize="28sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -225,7 +225,8 @@
app:layout_constraintTop_toBottomOf="@+id/txtMore"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
app:layout_constraintEnd_toEndOf="parent"
android:layoutAnimation="@anim/layout_animation_fall_down">
<CheckBox
android:id="@+id/cbGreetings"
+4 -4
View File
@@ -91,19 +91,19 @@
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:textAlignment="textEnd"
android:textColor="@color/colorText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="200dp"/>
app:layout_constraintWidth_max="200dp" />
<TextView
android:id="@+id/time"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textAlignment="textEnd"
@@ -114,7 +114,7 @@
<TextView
android:id="@+id/room"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
+1 -1
View File
@@ -29,7 +29,7 @@
<string name="yourName">Your name</string>
<string name="nextGrade">Next, tell me which grade you\'re in.</string>
<string name="yourGrade">Your grade</string>
<string name="seniorCourses">If you\'re in senior phase, please also tell me which courses you\'re enrolled in.</string>
<string name="seniorCourses">If you\'re in senior phase (E-Phase, Q-Phase), please also tell me which courses you\'re enrolled in.</string>
<string name="yourCourses">Your courses</string>
<string name="moreSettings">Lastly, just a few more settings.</string>
<string name="notificationsAndSync">Receive course notifications</string>