nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change text appearance

Browse source
This commit is contained in:
Jarne Demeulemeester 2021-06-17 20:56:43 +02:00
parent 8ccc6a0ef7
commit 6c220619ef
No known key found for this signature in database
GPG key ID: B61B7B150DB6A6D2
8 changed files with 13 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/layout/base_item.xml
View file

@ -27,12 +27,12 @@
<TextView <TextView
android:id="@+id/item_name" android:id="@+id/item_name"
style="@style/text_subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:text="@{item.name}" android:text="@{item.name}"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
tools:text="Movie title" /> tools:text="Movie title" />
</LinearLayout> </LinearLayout>
</layout> </layout>

2
app/src/main/res/layout/collection_item.xml
View file

@ -26,10 +26,10 @@
app:shapeAppearanceOverlay="@style/roundedImageView" /> app:shapeAppearanceOverlay="@style/roundedImageView" />
<TextView <TextView
style="@style/text_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{collection.name}" android:text="@{collection.name}"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
tools:text="Movies" /> tools:text="Movies" />
</LinearLayout> </LinearLayout>
</layout> </layout>

2
app/src/main/res/layout/fragment_add_server.xml
View file

@ -44,11 +44,11 @@
<TextView <TextView
android:id="@+id/text_add_server" android:id="@+id/text_add_server"
style="@style/text_header"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="32dp" android:layout_marginBottom="32dp"
android:text="@string/add_server" android:text="@string/add_server"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
android:textColor="?android:textColorPrimary" /> android:textColor="?android:textColorPrimary" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout

10
app/src/main/res/layout/fragment_login.xml
View file

@ -42,11 +42,11 @@
<TextView <TextView
android:id="@+id/text_login" android:id="@+id/text_login"
style="@style/text_header"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="32dp" android:layout_marginBottom="32dp"
android:text="@string/login" android:text="@string/login"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
android:textColor="?android:textColorPrimary" /> android:textColor="?android:textColorPrimary" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
@ -61,8 +61,8 @@
android:id="@+id/edit_text_username" android:id="@+id/edit_text_username"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="text" android:autofillHints="username"
android:autofillHints="username"/> android:inputType="text" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@ -79,8 +79,8 @@
android:id="@+id/edit_text_password" android:id="@+id/edit_text_password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textPassword" android:autofillHints="password"
android:autofillHints="password"/> android:inputType="textPassword" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>

2
app/src/main/res/layout/fragment_server_select.xml
View file

@ -41,7 +41,7 @@
<TextView <TextView
android:id="@+id/text_add_server" android:id="@+id/text_add_server"
style="@style/text_header" android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp" android:layout_marginHorizontal="12dp"

1
app/src/main/res/layout/server_item.xml
View file

@ -37,6 +37,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{server.name}" android:text="@{server.name}"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

4
app/src/main/res/layout/view_item.xml
View file

@ -17,22 +17,22 @@
<TextView <TextView
android:id="@+id/view_name" android:id="@+id/view_name"
style="@style/text_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:text="@{view.name}" android:text="@{view.name}"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="Movies" /> tools:text="Movies" />
<TextView <TextView
android:id="@+id/view_all" android:id="@+id/view_all"
style="@style/text_regular"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:text="@string/view_all" android:text="@string/view_all"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
app:layout_constraintBaseline_toBaselineOf="@id/view_name" app:layout_constraintBaseline_toBaselineOf="@id/view_name"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

23
app/src/main/res/values/styles.xml
View file

@ -1,27 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<style name="text_giant_header">
<item name="android:textSize">48sp</item>
<item name="android:textFontWeight" tools:targetApi="p">700</item>
</style>
<style name="text_title">
<item name="android:textSize">18sp</item>
<item name="android:textFontWeight" tools:targetApi="p">500</item>
</style>
<style name="text_header">
<item name="android:textSize">24sp</item>
<item name="android:textFontWeight" tools:targetApi="p">500</item>
</style>
<style name="text_regular">
<item name="android:textSize">14sp</item>
</style>
<style name="text_subtitle">
<item name="android:textSize">14sp</item>
<item name="android:textFontWeight" tools:targetApi="p">500</item>
</style>
<style name="text_metadata">
<item name="android:textSize">12sp</item>
</style>
<style name="setup_button"> <style name="setup_button">
<item name="android:layout_height">48dp</item> <item name="android:layout_height">48dp</item>
<item name="android:background">@drawable/button_setup_background</item> <item name="android:background">@drawable/button_setup_background</item>