Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit f4555669 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #7064 from thundernest/text_appearance_styles 

Reference styles via theme attributes
parents bb84da13 588d7a73

app/ui/legacy/src/main/res/layout/about_library.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
            android:id="@+id/name"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAppearance="@style/TextAppearance.AppCompat.Medium"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="?android:attr/textColorPrimary"

            tools:text="Android Jetpack libraries" />
@@ -25,7 +25,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="4dp"

            android:textAppearance="@style/TextAppearance.AppCompat.Small"

            android:textAppearance="?android:attr/textAppearanceSmall"

            tools:text="Apache License, Version 2.0" />



</LinearLayout>

app/ui/legacy/src/main/res/layout/accounts_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
                android:singleLine="true"

                android:ellipsize="end"

                android:textColor="?android:attr/textColorPrimary"

                android:textAppearance="@style/TextAppearance.K9.Medium"

                android:textSize="@dimen/appTextSizeMedium"

                tools:text="@sample/accounts.json/data/name"/>



        <TextView
@@ -45,7 +45,7 @@ 
                android:singleLine="true"

                android:ellipsize="end"

                android:textColor="?android:attr/textColorSecondary"

                android:textAppearance="@style/TextAppearance.K9.Small"

                android:textSize="@dimen/appTextSizeSmaller"

                tools:text="@sample/accounts.json/data/email"/>



    </LinearLayout>

app/ui/legacy/src/main/res/layout/changelog_list_change_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
        android:paddingEnd="4dp"

        android:paddingBottom="4dp"

        android:text="•"

        android:textAppearance="@style/TextAppearance.AppCompat.Body1"

        android:textAppearance="?attr/textAppearanceBody2"

        tools:ignore="HardcodedText" />



    <TextView
@@ -25,6 +25,6 @@ 
        android:paddingStart="0dp"

        android:paddingEnd="16dp"

        android:paddingBottom="4dp"

        android:textAppearance="@style/TextAppearance.AppCompat.Body1"

        android:textAppearance="?attr/textAppearanceBody2"

        tools:text="Bug fixes and minor improvements" />

</LinearLayout>

app/ui/legacy/src/main/res/layout/changelog_list_release_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
        android:paddingTop="8dp"

        android:paddingEnd="8dp"

        android:paddingBottom="8dp"

        android:textAppearance="@style/TextAppearance.AppCompat.Title"

        android:textAppearance="?attr/textAppearanceHeadline6"

        tools:text="Version 1.0.0" />



    <TextView
@@ -26,6 +26,6 @@ 
        android:paddingTop="8dp"

        android:paddingEnd="16dp"

        android:paddingBottom="8dp"

        android:textAppearance="@style/TextAppearance.AppCompat.Small"

        android:textAppearance="?android:attr/textAppearanceSmall"

        tools:text="2021-01-21" />

</LinearLayout>

app/ui/legacy/src/main/res/layout/fragment_about.xml

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
            android:paddingTop="16dp"

            android:paddingBottom="8dp"

            android:text="@string/about_title"

            android:textAppearance="@style/TextAppearance.AppCompat.Body2"

            android:textAppearance="?attr/textAppearanceSubtitle2"

            android:textColor="?attr/colorAccent" />



        <LinearLayout
@@ -197,7 +197,7 @@ 
            android:paddingTop="16dp"

            android:paddingBottom="8dp"

            android:text="@string/about_project_title"

            android:textAppearance="@style/TextAppearance.AppCompat.Body2"

            android:textAppearance="?attr/textAppearanceSubtitle2"

            android:textColor="?attr/colorAccent" />



        <LinearLayout
@@ -368,7 +368,7 @@ 
            android:paddingTop="16dp"

            android:paddingBottom="8dp"

            android:text="@string/about_libraries"

            android:textAppearance="@style/TextAppearance.AppCompat.Body2"

            android:textAppearance="?attr/textAppearanceSubtitle2"

            android:textColor="?attr/colorAccent" />



        <androidx.recyclerview.widget.RecyclerView