karolina/avh-plan-android
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added "Last updated" string to FoodFragment and info dialog, simplified "if-else" branch in MiscData.getIcon() to when-statement

Browse Source
This commit is contained in:
Deniz Düzgören
2019-07-31 11:27:46 +02:00
parent 47cbaaf53c
commit dbea6a60eb
8 changed files with 89 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/app_bar_main.xml
+3 -2
View File
@@ -17,7 +17,6 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="84dp"
app:popupTheme="@style/AppThemeLight.PopupOverlay"
app:titleTextColor="@color/accent"
app:contentInsetStart="0dp"
android:elevation="0dp"
@@ -29,7 +28,7 @@
<TextView
android:id="@+id/toolbarTxt"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:fontFamily="@font/manrope_extrabold"
@@ -38,8 +37,10 @@
android:textSize="24sp"
android:singleLine="true"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<TextView
app/src/main/res/layout/course_card.xml
+3 -5
View File
@@ -98,12 +98,10 @@
android:layout_width="20dp"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toTopOf="@+id/room"
android:tint="@color/textcolor"
app:layout_constraintBottom_toBottomOf="@+id/course"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/group"
android:tint="@color/textcolor"/>
app:layout_constraintTop_toTopOf="@+id/course" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/values-de/strings.xml
+3 -3
View File
@@ -113,7 +113,7 @@
<item>Wie geht\'s dir, %s?</item>
<item>Gut geschlafen, %s?</item>
<item>Hey, %s!</item>
<item>Hi, %s!</item>
<item>Hi %s!</item>
<item>Schön dich zu sehen, %s.</item>
<item>Wie geht\'s dir so, %s?</item>
</string-array>
@@ -123,7 +123,7 @@
<item>Wie geht\'s dir, %s?</item>
<item>Hoffe du hast einen schönen Tag, %s.</item>
<item>Hey, %s!</item>
<item>Hi, %s!</item>
<item>Hi %s!</item>
<item>Schön dich zu sehen, %s.</item>
<item>Genieß\' deinen Tag, %s.</item>
</string-array>
@@ -133,7 +133,7 @@
<item>Wie geht\'s dir, %s?</item>
<item>Genieß\' deinen Abend, %s.</item>
<item>Hey, %s!</item>
<item>Hi, %s!</item>
<item>Hi %s!</item>
<item>Schlaf\' gut, %s.</item>
<item>Bleib\' nicht zu lang wach, %s!</item>
</string-array>
app/src/main/res/values/strings.xml
+4 -5
View File
@@ -127,7 +127,7 @@
<item>How are you, %s?</item>
<item>Slept well, %s?</item>
<item>Hey, %s!</item>
<item>Hi, %s!</item>
<item>Hi %s!</item>
<item>Nice to see you, %s.</item>
<item>How\'ve you been, %s?</item>
</string-array>
@@ -137,7 +137,7 @@
<item>How are you, %s?</item>
<item>Enjoying your day, %s?</item>
<item>Hey, %s!</item>
<item>Hi, %s!</item>
<item>Hi %s!</item>
<item>Nice to see you, %s.</item>
<item>Enjoy your day, %s!</item>
</string-array>
@@ -147,9 +147,8 @@
<item>How are you, %s?</item>
<item>Enjoying your evening, %s?</item>
<item>Hey, %s!</item>
<item>Hi, %s!</item>
<item>Hi %s!</item>
<item>Sleep tight, %s.</item>
<item>Stayin\' up late, %s?</item>
<item>Staying up late, %s?</item>
</string-array>
</resources>