Hide the select button for the already selected theme

And reorder themes, Finn's theme on top, as it is the default ^^
This commit is contained in:
Finn M Glas 2020-05-23 12:37:15 +02:00
parent 442b7b8712
commit 1d540f7d37
No known key found for this signature in database
GPG key ID: 25037A2E81AB459C
3 changed files with 50 additions and 30 deletions

View file

@ -22,35 +22,6 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10sp"
app:cardCornerRadius="8dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:scaleType="fitXY"
app:srcCompat="@drawable/dark_theme" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="chooseDarkTheme"
android:text="@string/settings_select_theme"
android:textAllCaps="false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -70,6 +41,7 @@
app:srcCompat="@drawable/finnmglas_theme" />
<Button
android:id="@+id/select_theme_finn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="chooseFinnTheme"
@ -82,6 +54,36 @@
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10sp"
app:cardCornerRadius="8dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:scaleType="fitXY"
app:srcCompat="@drawable/dark_theme" />
<Button
android:id="@+id/select_theme_dark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="chooseDarkTheme"
android:text="@string/settings_select_theme"
android:textAllCaps="false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -100,6 +102,7 @@
app:srcCompat="@drawable/custom_theme" />
<Button
android:id="@+id/select_theme_custom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="chooseCustomTheme"