Global shape theming

This commit is contained in:
jarnedemeulemeester 2021-10-03 11:43:34 +02:00
parent 976b56ce00
commit da39db03d0
No known key found for this signature in database
GPG key ID: 60884A0C1EBA43E5
14 changed files with 23 additions and 22 deletions

View file

@ -31,7 +31,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/roundedImageView" /> app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
<TextView <TextView
android:id="@+id/item_name" android:id="@+id/item_name"

View file

@ -29,7 +29,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/roundedImageView" /> app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"

View file

@ -39,7 +39,7 @@
app:baseItemImage="@{viewModel.item}" app:baseItemImage="@{viewModel.item}"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/holder" app:layout_constraintTop_toBottomOf="@id/holder"
app:shapeAppearance="@style/roundedImageView" /> app:shapeAppearance="@style/ShapeAppearanceOverlay.Findroid.Image" />
<FrameLayout <FrameLayout
android:id="@+id/missing_icon" android:id="@+id/missing_icon"

View file

@ -30,7 +30,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/roundedImageView" /> app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
<ImageView <ImageView
android:id="@+id/played_icon" android:id="@+id/played_icon"

View file

@ -76,8 +76,8 @@
<Button <Button
android:id="@+id/button_connect" android:id="@+id/button_connect"
style="@style/setup_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_launcher_foreground" android:drawableStart="@drawable/ic_launcher_foreground"
android:text="@string/button_connect" /> android:text="@string/button_connect" />

View file

@ -92,8 +92,8 @@
<Button <Button
android:id="@+id/button_login" android:id="@+id/button_login"
style="@style/setup_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/button_login" /> android:text="@string/button_login" />
<ProgressBar <ProgressBar

View file

@ -363,7 +363,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:shapeAppearance="@style/roundedImageView" /> app:shapeAppearance="@style/ShapeAppearanceOverlay.Findroid.Image" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"

View file

@ -68,7 +68,6 @@
<Button <Button
android:id="@+id/button_add_server" android:id="@+id/button_add_server"
style="@style/setup_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"

View file

@ -27,7 +27,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/roundedImageView" /> app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
<TextView <TextView
android:id="@+id/primary_name" android:id="@+id/primary_name"

View file

@ -25,7 +25,7 @@
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
app:personImage="@{person}" app:personImage="@{person}"
app:shapeAppearanceOverlay="@style/roundedImageView" /> app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
<TextView <TextView
android:id="@+id/person_name" android:id="@+id/person_name"

View file

@ -58,7 +58,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:seasonPoster="@{seasonId}" app:seasonPoster="@{seasonId}"
app:shapeAppearanceOverlay="@style/roundedImageView" /> app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
<TextView <TextView
android:id="@+id/series_name" android:id="@+id/series_name"

View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="ShapeAppearance.Findroid.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
<item name="cornerSize">10dp</item>
</style>
<style name="ShapeAppearanceOverlay.Findroid.Image" parent="">
<item name="cornerSize">10dp</item>
</style>
</resources>

View file

@ -1,16 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="setup_button">
<item name="android:layout_height">48dp</item>
<item name="android:background">@drawable/button_setup_background</item>
</style>
<style name="roundedImageView">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">10dp</item>
</style>
<style name="ErrorDialogStyle" parent="MaterialAlertDialog.MaterialComponents"> <style name="ErrorDialogStyle" parent="MaterialAlertDialog.MaterialComponents">
<item name="materialAlertDialogBodyTextStyle">@style/AlertDialogBodyText</item> <item name="materialAlertDialogBodyTextStyle">@style/AlertDialogBodyText</item>
</style> </style>
@ -19,5 +9,4 @@
<item name="android:fontFamily">monospace</item> <item name="android:fontFamily">monospace</item>
</style> </style>
</resources> </resources>

View file

@ -28,6 +28,9 @@
<!-- Navigation bar --> <!-- Navigation bar -->
<item name="android:navigationBarColor">?attr/colorSurface</item> <item name="android:navigationBarColor">?attr/colorSurface</item>
<!-- Shapes -->
<item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.Findroid.SmallComponent</item>
<!-- Toolbar --> <!-- Toolbar -->
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item> <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
</style> </style>