Notification bell (#2012)
* Add notification bell button, API endpoints and new relationship field * Add notification type for subscriptions * Add subscriptions to legacy notification filtering * Update schemas * Fix build * Make rewrite static method into method of Notification class, fix getNotificationText * Mastodon wording for subscriptions
This commit is contained in:
Alibek Omarov
GitHub
parent
a917e0dad8
commit
b91a0aceeb
18 changed files with 970 additions and 33 deletions
13
app/src/main/res/drawable/ic_notifications_active_24dp.xml
Normal file
13
app/src/main/res/drawable/ic_notifications_active_24dp.xml
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<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="M0 0h24v24H0V0z" />
|
||||
<path
|
||||
android:fillColor="#000000"
|
||||
android:pathData="M18 16v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-0.83-0.68-1.5-1.51-1.5S10.5 3.17 10.5 4v0.68C7.63 5.36 6 7.92 6 11v5l-1.3 1.29c-0.63 0.63 -0.19 1.71 0.7 1.71h13.17c0.89 0 1.34-1.08 0.71 -1.71L18 16zm-6.01 6c1.1 0 2-0.9 2-2h-4c0 1.1 0.89 2 2 2zM6.77 4.73c0.42-0.38 0.43 -1.03 0.03 -1.43-0.38-0.38-1-0.39-1.39-0.02C3.7 4.84 2.52 6.96 2.14 9.34c-0.09 0.61 0.38 1.16 1 1.16 0.48 0 0.9-0.35 0.98 -0.83 0.3 -1.94 1.26-3.67 2.65-4.94zM18.6 3.28c-0.4-0.37-1.02-0.36-1.4 0.02 -0.4 0.4 -0.38 1.04 0.03 1.42 1.38 1.27 2.35 3 2.65 4.94 0.07 0.48 0.49 0.83 0.98 0.83 0.61 0 1.09-0.55 0.99 -1.16-0.38-2.37-1.55-4.48-3.25-6.05z" />
|
||||
</vector>
|
||||
|
|
@ -71,6 +71,26 @@
|
|||
app:layout_constraintStart_toEndOf="@id/accountMuteButton"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:text="Follow Requested" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/accountSubscribeButton"
|
||||
style="@style/TuskyButton.Outlined"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:minWidth="0dp"
|
||||
android:paddingStart="8dp"
|
||||
android:paddingEnd="4dp"
|
||||
android:scaleType="centerInside"
|
||||
app:icon="@drawable/ic_notifications_24dp"
|
||||
app:layout_constrainedHeight="true"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/accountFollowButton"
|
||||
app:layout_constraintEnd_toStartOf="@id/accountFollowButton"
|
||||
app:layout_constraintHorizontal_bias="1"
|
||||
app:layout_constraintHorizontal_chainStyle="packed"
|
||||
app:layout_constraintStart_toStartOf="@id/accountMuteButton"
|
||||
app:layout_constraintTop_toTopOf="@+id/accountFollowButton" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/accountMuteButton"
|
||||
|
|
@ -86,7 +106,7 @@
|
|||
app:icon="@drawable/ic_unmute_24dp"
|
||||
app:layout_constrainedHeight="true"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/accountFollowButton"
|
||||
app:layout_constraintEnd_toStartOf="@id/accountFollowButton"
|
||||
app:layout_constraintEnd_toStartOf="@id/accountSubscribeButton"
|
||||
app:layout_constraintHorizontal_bias="1"
|
||||
app:layout_constraintHorizontal_chainStyle="packed"
|
||||
app:layout_constraintStart_toStartOf="@id/guideAvatar"
|
||||
|
|
|
|||
|
|
@ -145,8 +145,6 @@
|
|||
android:layout_marginRight="14dp"
|
||||
android:layout_marginBottom="14dp"
|
||||
android:contentDescription="@string/action_view_profile"
|
||||
android:paddingRight="12dp"
|
||||
android:paddingBottom="12dp"
|
||||
android:scaleType="centerCrop"
|
||||
tools:ignore="RtlHardcoded,RtlSymmetry"
|
||||
tools:src="@drawable/avatar_default" />
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@
|
|||
<string name="notification_favourite_format">%s favorited your toot</string>
|
||||
<string name="notification_follow_format">%s followed you</string>
|
||||
<string name="notification_follow_request_format">%s requested to follow you</string>
|
||||
<string name="notification_subscription_format">%s just posted</string>
|
||||
|
||||
<string name="report_username_format">Report @%s</string>
|
||||
<string name="report_comment_hint">Additional comments?</string>
|
||||
|
|
@ -223,6 +224,7 @@
|
|||
<string name="pref_title_notification_filter_reblogs">my posts are boosted</string>
|
||||
<string name="pref_title_notification_filter_favourites">my posts are favorited</string>
|
||||
<string name="pref_title_notification_filter_poll">polls have ended</string>
|
||||
<string name="pref_title_notification_filter_subscriptions">somebody I\'m subscribed to published a new toot</string>
|
||||
<string name="pref_title_appearance_settings">Appearance</string>
|
||||
<string name="pref_title_app_theme">App Theme</string>
|
||||
<string name="pref_title_timelines">Timelines</string>
|
||||
|
|
@ -287,7 +289,8 @@
|
|||
<string name="notification_favourite_description">Notifications when your toots get marked as favorite</string>
|
||||
<string name="notification_poll_name">Polls</string>
|
||||
<string name="notification_poll_description">Notifications about polls that have ended</string>
|
||||
|
||||
<string name="notification_subscription_name">New toots</string>
|
||||
<string name="notification_subscription_description">Notifications when somebody you\'re subscribed to published a new toot</string>
|
||||
|
||||
<string name="notification_mention_format">%s mentioned you</string>
|
||||
<string name="notification_summary_large">%1$s, %2$s, %3$s and %4$d others</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue