a66f7bb515
Merge tag 'v28.0' into develop
...
# Conflicts:
# README.md
# app/build.gradle
# app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt
# app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
# app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt
# app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/filters/FiltersActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/trending/TrendingTagsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/view/GraphView.kt
# app/src/main/res/color/compound_button_color.xml
# app/src/main/res/color/text_input_layout_box_stroke_color.xml
# app/src/main/res/drawable/ic_check_circle.xml
# app/src/main/res/drawable/ic_flag_24dp.xml
# app/src/main/res/drawable/ic_person_add_24dp.xml
# app/src/main/res/drawable/ic_play_indicator.xml
# app/src/main/res/drawable/ic_poll_24dp.xml
# app/src/main/res/drawable/ic_reblog_active_24dp.xml
# app/src/main/res/drawable/ic_reblog_private_active_24dp.xml
# app/src/main/res/drawable/report_success_background.xml
# app/src/main/res/layout-land/item_trending_cell.xml
# app/src/main/res/layout/activity_account.xml
# app/src/main/res/layout/activity_edit_filter.xml
# app/src/main/res/layout/card_license.xml
# app/src/main/res/layout/item_announcement.xml
# app/src/main/res/layout/item_status.xml
# app/src/main/res/layout/item_status_detailed.xml
# app/src/main/res/layout/item_tab_preference.xml
# app/src/main/res/layout/item_trending_cell.xml
# app/src/main/res/values-cs/strings.xml
# app/src/main/res/values-de/strings.xml
# app/src/main/res/values-es/strings.xml
# app/src/main/res/values-eu/strings.xml
# app/src/main/res/values-fr/strings.xml
# app/src/main/res/values-kab/strings.xml
# app/src/main/res/values-lv/strings.xml
# app/src/main/res/values-nb-rNO/strings.xml
# app/src/main/res/values-night/theme_colors.xml
# app/src/main/res/values/colors.xml
# app/src/main/res/values/strings.xml
# app/src/main/res/values/styles.xml
# app/src/main/res/values/theme_colors.xml
2026-01-03 09:57:39 +11:00
875013e47f
Merge tag 'v25.2' into develop
...
# Conflicts:
# README.md
# app/build.gradle
# app/lint-baseline.xml
# app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt
# app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
# app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.kt
# app/src/main/res/layout/activity_about.xml
# app/src/main/res/layout/item_emoji_pref.xml
# app/src/main/res/values-ar/strings.xml
# app/src/main/res/values-bg/strings.xml
# app/src/main/res/values-cy/strings.xml
# app/src/main/res/values-de/strings.xml
# app/src/main/res/values-fa/strings.xml
# app/src/main/res/values-gd/strings.xml
# app/src/main/res/values-gl/strings.xml
# app/src/main/res/values-hu/strings.xml
# app/src/main/res/values-is/strings.xml
# app/src/main/res/values-it/strings.xml
# app/src/main/res/values-ja/strings.xml
# app/src/main/res/values-nl/strings.xml
# app/src/main/res/values-oc/strings.xml
# app/src/main/res/values-pt-rBR/strings.xml
# app/src/main/res/values-pt-rPT/strings.xml
# app/src/main/res/values-ru/strings.xml
# app/src/main/res/values-si/strings.xml
# app/src/main/res/values-sv/strings.xml
# app/src/main/res/values-tr/strings.xml
# app/src/main/res/values-uk/strings.xml
# app/src/main/res/values-vi/strings.xml
# app/src/main/res/values-zh-rCN/strings.xml
# app/src/main/res/values/strings.xml
# fastlane/metadata/android/ru/full_description.txt
# fastlane/metadata/android/zh-Hans/full_description.txt
2026-01-02 18:27:41 +11:00
Nik Clayton
f1b3faf85f
Show the follower's bio/note in a "followed you" notification ( #3281 )
...
This makes the notification view for a follow request contain more info about the new follower, and makes the layout (of their name / username) consistent with other notifications that show names/usernames.
2023-04-24 12:09:34 +02:00
Konrad Pozniak
3e849244f9
move Html parsing to ViewData ( #2414 )
...
* move Html parsing to ViewData
* refactor reports to use viewdata
* cleanup code
* refactor conversations
* fix getEditableText
* rename StatusParsingHelper
* fix tests
* commit db schema file
* add file header
* rename helper function to parseAsMastodonHtml
* order imports correctly
* move mapping off main thread to default dispatcher
* fix ktlint
2022-04-15 13:20:27 +02:00
Konrad Pozniak
e05fdc6d7b
Fix status diffing and improve timeline performance ( #2386 )
...
* fix status & account diffing
* introduce TimelineAccount
* use TimelineAccount where possible
* improve tests
* improve ConversationEntity equals/hashcode
* fix mistake in ConversationEntity
* improve StatusViewData comparison
* improve tests
* fix typo in comment
2022-03-15 21:34:57 +01:00
