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

Fixed computer science not being tinted due to a spelling mistake; fixed greeting text label not obeying the right margin and clipping near the right side of the toolbar

Browse Source
This commit is contained in:
Deniz Düzgören
2019-09-12 16:55:49 +02:00
parent 81b4c04159
commit 78dd498a63
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/denizd/substitutionplan/adapters/CardAdapter.kt
+1 -1
View File
@@ -158,7 +158,7 @@ internal class CardAdapter(private var mSubst: List<Subst>, private val prefs: S
"laa", "laf", "lat" -> "Latin" "laa", "laf", "lat" -> "Latin"
"spa", "spf" -> "Spanish" "spa", "spf" -> "Spanish"
"fra", "frf", "frz" -> "French" "fra", "frf", "frz" -> "French"
"inf" -> "Compsci" "inf" -> "CompSci"
"ges" -> "History" "ges" -> "History"
"rel" -> "Religion" "rel" -> "Religion"
"geg" -> "Geography" "geg" -> "Geography"
app/src/main/res/layout/app_bar_main.xml
+3 -4
View File
@@ -22,8 +22,6 @@
android:elevation="0dp" android:elevation="0dp"
app:layout_scrollFlags="scroll|enterAlwaysCollapsed"> app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
<!-- 84dp-->
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -33,13 +31,14 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:textColor="@color/colorAccent" android:textColor="@color/colorAccent"
android:textSize="18sp" android:textSize="18sp"
android:fontFamily="@font/manrope_semibold" android:fontFamily="@font/manrope_semibold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintEnd_toEndOf="parent"/>
<TextView <TextView
android:id="@+id/toolbarTxt" android:id="@+id/toolbarTxt"
app/src/main/res/values/styles.xml
+1 -1
View File
@@ -40,7 +40,7 @@
<item name="colorControlHighlight">@color/colorAccent</item> <item name="colorControlHighlight">@color/colorAccent</item>
</style> </style>
<!-- The launcher theme. It sets the main window background to the launch_screen drawable --> <!-- Launch / splash screen -->
<style name="AppTheme0.Launcher"> <style name="AppTheme0.Launcher">
<item name="android:windowBackground">@drawable/launch_screen</item> <item name="android:windowBackground">@drawable/launch_screen</item>
<item name="android:statusBarColor">@android:color/transparent</item> <item name="android:statusBarColor">@android:color/transparent</item>