notfire/moshidon
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge branch 'ui/profile-header-tweaks' into fork

Browse source
This commit is contained in:
sk 2022-11-21 18:26:56 +01:00
commit c9b11a23a1
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mastodon/src/main/res/layout/fragment_profile.xml
View file

@ -29,9 +29,9 @@
android:id="@+id/cover" android:id="@+id/cover"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="200dp" android:layout_height="200dp"
android:background="?colorWindowBackground" android:background="?profileHeaderBackground"
android:contentDescription="@string/profile_header" android:contentDescription="@string/profile_header"
android:scaleType="centerCrop"/> android:scaleType="centerCrop" />
<TextView <TextView
android:id="@+id/follows_you" android:id="@+id/follows_you"

1
mastodon/src/main/res/values/attrs.xml
View file

@ -16,6 +16,7 @@
<attr name="colorSearchHint" format="color"/> <attr name="colorSearchHint" format="color"/>
<attr name="colorTabInactive" format="color"/> <attr name="colorTabInactive" format="color"/>
<attr name="colorAccentLightest" format="color"/> <attr name="colorAccentLightest" format="color"/>
<attr name="profileHeaderBackground" format="color"/>
<attr name="primaryLargeButtonStyle" format="reference"/> <attr name="primaryLargeButtonStyle" format="reference"/>
<attr name="secondaryLargeButtonStyle" format="reference"/> <attr name="secondaryLargeButtonStyle" format="reference"/>

2
mastodon/src/main/res/values/styles.xml
View file

@ -36,6 +36,7 @@
<item name="colorSearchHint">@color/gray_600</item> <item name="colorSearchHint">@color/gray_600</item>
<item name="colorTabInactive">@color/gray_400</item> <item name="colorTabInactive">@color/gray_400</item>
<item name="colorAccentLightest">@color/primary_100</item> <item name="colorAccentLightest">@color/primary_100</item>
<item name="profileHeaderBackground">@color/gray_500</item>
<item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item> <item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item>
<item name="android:editTextBackground">@drawable/bg_edittext_light</item> <item name="android:editTextBackground">@drawable/bg_edittext_light</item>
@ -80,6 +81,7 @@
<item name="colorAccentLight">@color/primary_600</item> <item name="colorAccentLight">@color/primary_600</item>
<item name="colorAccentLightest">@color/primary_800</item> <item name="colorAccentLightest">@color/primary_800</item>
<item name="colorTabInactive">@color/gray_400</item> <item name="colorTabInactive">@color/gray_400</item>
<item name="profileHeaderBackground">?colorWindowBackground</item>
<!-- TODO dark colors --> <!-- TODO dark colors -->
<item name="colorSearchField">@color/gray_700</item> <item name="colorSearchField">@color/gray_700</item>