add role badges (#4029)
This adds support for the new Mastodon 4.2 role badges. Admins can
define if a role should be visible in the interface and then we get it
delivered by the Api on the `Account` object like this:
```
"roles": [
{
"id": "4",
"name": "TEST",
"color": "#ffee00"
}
]
```
- keeps compatibility with older Mastodon version and non Mastodon
servers
- Took me a while, but I figured out a way to use the color and have it
look ok on all backgrounds (Mastodon itself ignores the color and just
always uses its brand color)
- falls back to Tusky blue in case no color is configured
- I adjusted the "Follows you" and "Bot" badges so they match the new
badge style
- In case the "Follows you" and "Bot" badges are visible at the same
time, "Follows you" gets its own line and "Bot" goes into the same line
as the role badge.
- Will work even with a lot of role badges (right now users can only
have 1 role at once though)
- Will work even when the badges federate (right now they don't)
<img
src="https://github.com/tuskyapp/Tusky/assets/10157047/24cbe889-ae46-408e-bfa0-cf3fd3c24f74"
width="320" />
This commit is contained in:
Konrad Pozniak
GitHub
parent
82bc48c3ae
commit
5764c903e1
7 changed files with 132 additions and 36 deletions
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<stroke android:width="1dp" android:color="?android:attr/textColorTertiary"/>
|
||||
<corners android:radius="12dp"/>
|
||||
<padding android:bottom="2dp" android:top="2dp" android:left="8dp" android:right="8dp"/>
|
||||
</shape>
|
||||
10
app/src/main/res/drawable/profile_badge_person_24dp.xml
Normal file
10
app/src/main/res/drawable/profile_badge_person_24dp.xml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="m12,12c2.688,0 4.864,-2.177 4.864,-4.864 0,-2.688 -2.177,-4.864 -4.864,-4.864 -2.688,0 -4.864,2.177 -4.864,4.864C7.136,9.823 9.312,12 12,12ZM12,14.432c-3.247,0 -9.729,1.63 -9.729,4.864v2.432L21.729,21.729L21.729,19.297c0,-3.235 -6.482,-4.864 -9.729,-4.864z"
|
||||
android:strokeWidth="1.2161"
|
||||
android:fillColor="#000000"/>
|
||||
</vector>
|
||||
|
|
@ -34,8 +34,8 @@
|
|||
android:layout_height="180dp"
|
||||
android:layout_alignTop="@+id/account_header_info"
|
||||
android:background="?attr/colorPrimaryDark"
|
||||
android:scaleType="centerCrop"
|
||||
android:contentDescription="@string/label_header"
|
||||
android:scaleType="centerCrop"
|
||||
app:layout_collapseMode="parallax"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
|
|
@ -154,40 +154,42 @@
|
|||
app:tint="?android:textColorSecondary"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<TextView
|
||||
<com.google.android.material.chip.Chip
|
||||
android:id="@+id/accountFollowsYouTextView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="6dp"
|
||||
android:background="@drawable/profile_badge_background"
|
||||
android:clickable="false"
|
||||
android:focusable="false"
|
||||
android:minHeight="@dimen/profile_badge_min_height"
|
||||
android:text="@string/follows_you"
|
||||
android:textSize="?attr/status_text_small"
|
||||
android:visibility="gone"
|
||||
app:chipBackgroundColor="#0000"
|
||||
app:chipMinHeight="@dimen/profile_badge_min_height"
|
||||
app:chipStrokeColor="?android:attr/textColorTertiary"
|
||||
app:chipStrokeWidth="@dimen/profile_badge_stroke_width"
|
||||
app:ensureMinTouchTargetSize="false"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/accountUsernameTextView"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/accountBadgeTextView"
|
||||
android:layout_width="wrap_content"
|
||||
<com.google.android.material.chip.ChipGroup
|
||||
android:id="@+id/accountBadgeContainer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="6dp"
|
||||
android:background="@drawable/profile_badge_background"
|
||||
android:text="@string/profile_badge_bot_text"
|
||||
android:textSize="?attr/status_text_small"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintStart_toEndOf="@id/accountFollowsYouTextView"
|
||||
app:layout_constraintTop_toBottomOf="@id/accountUsernameTextView"
|
||||
app:layout_goneMarginStart="0dp"
|
||||
tools:visibility="visible" />
|
||||
app:chipSpacingVertical="4dp"
|
||||
app:layout_constraintStart_toEndOf="@id/accountUsernameTextView"
|
||||
app:layout_constraintTop_toBottomOf="@id/accountFollowsYouTextView"
|
||||
app:layout_goneMarginStart="0dp" />
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/labelBarrier"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:barrierDirection="bottom"
|
||||
app:constraint_referenced_ids="accountFollowsYouTextView,accountBadgeTextView" />
|
||||
app:constraint_referenced_ids="accountFollowsYouTextView,accountBadgeContainer" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/accountNoteTextInputLayout"
|
||||
|
|
@ -225,10 +227,11 @@
|
|||
android:lineSpacingMultiplier="1.1"
|
||||
android:paddingTop="2dp"
|
||||
android:textColor="?android:textColorTertiary"
|
||||
android:textDirection="firstStrong"
|
||||
android:textIsSelectable="true"
|
||||
android:textSize="?attr/status_text_medium"
|
||||
android:textDirection="firstStrong"
|
||||
app:layout_constraintTop_toBottomOf="@id/saveNoteInfo"
|
||||
app:layout_goneMarginTop="8dp"
|
||||
tools:text="This is a test description. Descriptions can be quite looooong." />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
|
|
@ -245,12 +248,12 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
tools:text="April, 1971"
|
||||
android:textColor="@color/textColorSecondary"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@id/accountRemoveView"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/accountFieldList"
|
||||
app:layout_constraintBottom_toTopOf="@id/accountRemoveView"/>
|
||||
tools:text="April, 1971" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/accountRemoveView"
|
||||
|
|
@ -269,8 +272,8 @@
|
|||
android:id="@+id/accountMovedView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
android:layout_marginTop="4dp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintTop_toBottomOf="@id/accountRemoveView"
|
||||
tools:visibility="visible">
|
||||
|
||||
|
|
@ -287,16 +290,16 @@
|
|||
tools:text="Account has moved" />
|
||||
|
||||
<ImageView
|
||||
android:importantForAccessibility="no"
|
||||
android:id="@+id/accountMovedAvatar"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginEnd="24dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:importantForAccessibility="no"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/accountMovedText"
|
||||
tools:src="@drawable/avatar_default" />
|
||||
|
||||
|
|
@ -471,8 +474,8 @@
|
|||
android:layout_width="@dimen/account_activity_avatar_size"
|
||||
android:layout_height="@dimen/account_activity_avatar_size"
|
||||
android:layout_marginStart="16dp"
|
||||
android:padding="3dp"
|
||||
android:contentDescription="@string/label_avatar"
|
||||
android:padding="3dp"
|
||||
app:layout_anchor="@+id/accountHeaderInfoContainer"
|
||||
app:layout_anchorGravity="top"
|
||||
app:layout_scrollFlags="scroll"
|
||||
|
|
|
|||
|
|
@ -66,4 +66,11 @@
|
|||
|
||||
<dimen name="timeline_status_avatar_height">48dp</dimen>
|
||||
<dimen name="timeline_status_avatar_width">48dp</dimen>
|
||||
|
||||
<dimen name="profile_badge_stroke_width">1dp</dimen>
|
||||
<dimen name="profile_badge_min_height">24dp</dimen>
|
||||
<dimen name="profile_badge_icon_size">16dp</dimen>
|
||||
<dimen name="profile_badge_icon_start_padding">8dp</dimen>
|
||||
<dimen name="profile_badge_icon_end_padding">0dp</dimen>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue