This repository has been archived by the owner on Oct 28, 2024. It is now read-only.
forked from mastodon/mastodon-android
-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
98 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 71 additions & 49 deletions
120
mastodon/src/main/res/layout/display_item_notification_header.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,85 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:orientation="horizontal" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="64dp" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="horizontal" | ||
| android:gravity="center_vertical" | ||
| android:background="?android:selectableItemBackground" | ||
| android:paddingHorizontal="16dp"> | ||
| <!-- paddingEnd is set programmatically (depending on enableDeleteNotifications) --> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/icon" | ||
| android:layout_width="28dp" | ||
| android:layout_height="28dp" | ||
| android:importantForAccessibility="no" | ||
| tools:tint="#0f0" | ||
| tools:src="@drawable/ic_fluent_arrow_repeat_all_24_filled"/> | ||
| <LinearLayout | ||
| android:orientation="horizontal" | ||
| android:layout_width="0dp" | ||
| android:layout_weight="1" | ||
| android:layout_height="64dp" | ||
| android:gravity="center_vertical" | ||
| android:background="?android:selectableItemBackground"> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/avatar" | ||
| android:layout_width="32dp" | ||
| android:layout_height="32dp" | ||
| android:layout_marginStart="12dp"/> | ||
| <ImageView | ||
| android:id="@+id/icon" | ||
| android:layout_width="28dp" | ||
| android:layout_height="28dp" | ||
| android:importantForAccessibility="no" | ||
| tools:tint="#0f0" | ||
| tools:src="@drawable/ic_fluent_arrow_repeat_all_24_filled"/> | ||
|
|
||
| <org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content"> | ||
| <ImageView | ||
| android:id="@+id/avatar" | ||
| android:layout_width="32dp" | ||
| android:layout_height="32dp" | ||
| android:layout_marginStart="12dp"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/text" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="8dp" | ||
| android:textAppearance="@style/m3_body_large" | ||
| android:textColor="?colorM3OnSurface" | ||
| android:singleLine="true" | ||
| android:ellipsize="end" | ||
| tools:text="Notification text"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/separator" | ||
| <org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginHorizontal="4sp" | ||
| android:importantForAccessibility="no" | ||
| android:singleLine="true" | ||
| android:textAppearance="@style/m3_body_medium" | ||
| android:textColor="?colorM3OnSurfaceVariant" | ||
| android:text="@string/sk_separator"/> | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/timestamp" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:minWidth="56sp" | ||
| android:textAppearance="@style/m3_body_medium" | ||
| android:textColor="?colorM3OnSurfaceVariant" | ||
| android:maxLines="1" | ||
| tools:text="42m ago"/> | ||
| <TextView | ||
| android:id="@+id/text" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="8dp" | ||
| android:textAppearance="@style/m3_body_large" | ||
| android:textColor="?colorM3OnSurface" | ||
| android:singleLine="true" | ||
| android:ellipsize="end" | ||
| tools:text="Notification text"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/separator" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginHorizontal="4sp" | ||
| android:importantForAccessibility="no" | ||
| android:singleLine="true" | ||
| android:textAppearance="@style/m3_body_medium" | ||
| android:textColor="?colorM3OnSurfaceVariant" | ||
| android:text="@string/sk_separator"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/timestamp" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:minWidth="56sp" | ||
| android:textAppearance="@style/m3_body_medium" | ||
| android:textColor="?colorM3OnSurfaceVariant" | ||
| android:maxLines="1" | ||
| tools:text="42m ago"/> | ||
|
|
||
| </org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout> | ||
| </org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/delete_notification" | ||
| android:layout_width="36dp" | ||
| android:layout_height="48dp" | ||
| android:visibility="gone" | ||
| android:background="?android:actionBarItemBackground" | ||
| android:contentDescription="@string/sk_delete_notification" | ||
| android:tooltipText="@string/sk_delete_notification" | ||
| android:scaleType="center" | ||
| android:src="@drawable/ic_fluent_dismiss_20_filled" | ||
| android:tint="?colorM3OnSurfaceVariant" /> | ||
|
|
||
| </LinearLayout> | ||
| </LinearLayout> |