eeb6c3c96b
Merge remote-tracking branch 'tuskyapp/develop'
...
# Conflicts:
# app/build.gradle
# app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
# app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
# app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
# app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
# app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt
# app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
# app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/TimelineViewModel.kt
# app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt
# app/src/main/java/com/keylesspalace/tusky/db/TimelineStatusEntity.kt
# app/src/main/java/com/keylesspalace/tusky/di/NetworkModule.kt
# app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
# app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt
# app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.java
# app/src/main/res/layout/item_status_detailed.xml
# app/src/main/res/values-cy/strings.xml
# app/src/main/res/values-de/strings.xml
# app/src/main/res/values-es/strings.xml
# app/src/main/res/values-fa/strings.xml
# app/src/main/res/values-hu/strings.xml
# app/src/main/res/values-it/strings.xml
# app/src/main/res/values-ja/strings.xml
# app/src/main/res/values-nb-rNO/strings.xml
# app/src/main/res/values-oc/strings.xml
# app/src/main/res/values-tr/strings.xml
# app/src/main/res/values-zh-rCN/strings.xml
# app/src/main/res/values/strings.xml
# fastlane/metadata/android/sv/changelogs/74.txt
# fastlane/metadata/android/tr/changelogs/58.txt
# gradle/libs.versions.toml
2023-01-29 04:44:17 +09:00
61a45ae376
show status edits ( #3049 )
...
* show status edits part 1
* show status edits part 2 - load status edits
* fix code formatting
* add dialog to show status edits
* small improvements
* use ALIGN_CENTER to position status visibility icon when possible
* rename status_timestamp_info view to status_meta_info
* make dateFormat static
* remove commented-out code
* move edits to dedicated fragment
2023-01-02 14:09:18 +01:00
5be9a90333
Merge remote-tracking branch 'tuskyapp/develop'
2022-12-29 22:53:20 +09:00
ee765a3117
Convert AccountViewHolder from Java to Kotlin ( #3044 )
...
* Convert AccountViewHolder from Java to Kotlin
Use view binding in the converted code, which requires small changes in code
that calls constructors.
Pass showBotOverlays as a parameter, rather than having the code reach in to
the shared preferences, fixing a layering violation. This affects callers
and classes derived from AccountAdapter.
* Use 2-arg getString
* Simplify setting bot badge indicator
- Specify the drawable in the XML
- Use visible() to set visibility
- Rename ID to account_bot_badge to make it clearer that this is all it is for
* Use lateinit to avoid needing !! later
2022-12-28 19:07:43 +01:00
6b95790457
Add support for moderation report notifications ( #2887 )
...
* Add support for moderation report notifications
* Translate report categories
* Apply tint inside flag drawable
* Remove unused imports
Co-authored-by: Konrad Pozniak <connyduck@users.noreply.github.com>
2022-12-01 20:11:55 +01:00
004a9b4921
Merge remote-tracking branch 'tuskyapp/develop'
2022-11-12 04:35:49 +09:00
98092e6ff7
Spelling ( #2771 )
...
* spelling: activity
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: animation
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: detailed
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: hierarchy
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: javascript
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: memory
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: notification
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: opened
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: preferable
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: repetitive
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: spoiler
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: thumbnail
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: visibility
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
* spelling: whitespace
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2022-11-09 19:32:39 +01:00
55796c9a30
update minSdkVersion to 23 ( #2638 )
...
closes #2606
2022-08-04 16:48:26 +02:00
25bee533f1
Merge remote-tracking branch 'tuskyapp/develop'
...
# Conflicts:
# app/build.gradle
# app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
# app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
# app/src/main/res/values-zh-rCN/strings.xml
# app/src/main/res/values-zh-rTW/strings.xml
# app/src/main/res/values/strings.xml
2022-05-19 02:42:27 +09:00
8c6ccf4261
fix notification message formatting when username is not at the beginning of the message ( #2522 )
...
* fix notification message formatting when username is not at the beginning of the message
* search for placeholder in format string
2022-05-13 22:00:30 +02:00
95a1f5632b
Merge remote-tracking branch 'tuskyapp/develop'
2022-05-01 19:54:22 +09:00
e9b75119b3
improve bot badge ( #2466 )
...
* improve bot badge
* change badge corner radius
2022-04-28 20:39:06 +02:00
6c630e08dd
Merge remote-tracking branch 'tuskyapp/develop'
2022-04-24 16:42:54 +09:00
db7eac0a8d
guard against the status of a notification being null in rare cases ( #2449 )
...
* guard against the status of a notification being null in rare cases
* improve code, fix bug when payloads is not null
* remove findViewById
* add comments in NotificationsAdapter
2022-04-21 18:46:55 +02:00
dff039e123
Add support for post edit notifications ( #2431 )
...
* Add support for post edit notifications
* Update notification icon
2022-04-19 11:10:13 +02:00
e0abcbfada
Improve time format of posts when using absolute time ( #2413 )
...
* Improve time format of posts when using absolute time
* fix AbsoluteTimeFormatter, add tests
* fix tests
Co-authored-by: Conny Duck <k.pozniak@gmx.at>
2022-04-18 21:41:18 +02:00
d21d045eda
Support new signup notifications ( #2357 )
2022-04-14 19:39:30 +02:00
1228f645a6
Merge remote-tracking branch 'tuskyapp/develop'
2022-04-13 00:59:06 +09:00
2fc3ba3cee
Replace “status” by “post” in strings name and source values ( #2405 )
2022-03-27 12:23:25 +02:00
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
ba005c769b
Merge remote-tracking branch 'tuskyapp/develop'
2022-03-04 17:51:25 +09:00
4a8fa74f79
Merge commit '224161caf111a15887cbc8a419763e87fe69931d'
2022-03-04 00:37:23 +09:00
addce87eb6
Use tags from status when adding handlers to hashtag spans in status content ( #2344 )
...
* Migrate LinkHelper to kotlin
* Support tags field on statuses
* Use embedded tags list in status instead of text scraping to embed tag click handler.
Fixes #2283
* Make mentions and tags lists nonnullable
* Make LinkHelper.openLink a Context extension method
* Use builtin extension for uri conversion
* More cleanup in LinkHelper
* Add tests for LinkHelper.getDomain
* Unbreak tags in places that don't have a tag list (e.g. profiles)
* Fixup javadoc
2022-02-25 18:56:21 +01:00
c37ccbb6e8
Add confirmation for favourite and bookmark actions ( #2245 )
...
* Add confirmation for favourite and bookmark actions
* Favourite confirmation american spelling and default values
* Remove bookmarking confirmation
* Update app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
Co-authored-by: Konrad Pozniak <connyduck@users.noreply.github.com>
Co-authored-by: Konrad Pozniak <connyduck@users.noreply.github.com>
2021-10-04 07:48:44 +02:00
2005b32dfa
Merge remote-tracking branch 'tuskyapp/develop'
2021-07-03 23:59:57 +09:00
837ee2e40d
Convert some adapters to Kotlin ( #2187 )
...
* Rename .java adapters to .kt
* Convert Account adapters to Kotlin
* Apply feedback for adapter refactoring
2021-06-20 10:18:40 +02:00
44a5b42cac
Timeline refactor ( #2175 )
...
* Move Timeline files into their own package
* Introduce TimelineViewModel, add coroutines
* Simplify StatusViewData
* Handle timeilne fetch errors
* Rework filters, fix ViewThreadFragment
* Fix NotificationsFragment
* Simplify Notifications and Thread, handle pin
* Redo loading in TimelineViewModel
* Improve error handling in TimelineViewModel
* Rewrite actions in TimelineViewModel
* Apply feedback after timeline factoring review
* Handle initial failure in timeline correctly
2021-06-11 20:15:40 +02:00
59c62204c7
Fix crash in NotificationsAdapter when spoiler is null. ( #2178 )
2021-05-27 16:41:54 +02:00
609dcf46cb
Merge remote-tracking branch 'tuskyapp/develop'
2021-04-28 11:54:29 +09:00
dee6a3a160
always show follow requests in main menu ( #1809 )
...
* always show follow requests in main menu
* update recyclerview to v1.2.0
* fix bug that shows follow requests info to wrong users
2021-04-10 20:30:44 +02:00
41847bc009
Add missing breaks in switch statements ( #2127 )
2021-04-06 17:18:52 +02:00
fc4b47aee4
migrating to ViewBinding part 4: Adapters ( #2095 )
2021-03-07 19:24:01 +01:00
a746009f74
Merge remote-tracking branch 'tuskyapp/develop'
2021-03-04 15:08:48 +09:00
9580870445
Animated emoji support ( #2064 )
...
* Animated emoji support
* Try to query preference only once
* Revert to using SpannableStringBuilder
2021-02-06 08:14:51 +01:00
d5f5c0b695
Use Jsoup to hide quote link
2021-01-10 13:40:02 +09:00
2ea8ee6bc8
Merge remote-tracking branch 'tuskyapp/develop'
2020-12-31 09:35:22 +09:00
0fbb4e9713
Wellbeing mode ( #1992 )
...
* Add wellbeing mode settings toggle
* Translate wellbeing mode string to german
* Disable fav/boost count on toots if wellbeing is enabled
* Hide follow/post stats on profiles
* Reload notifications when wellbeing mode is toggled
* Add wellbeing mode explainer dialog
* Move wellbeing filter timeline into own category
* Add toggles for quantitative stats
* Hide announcement badge counts if wellbeing is enabled
* Move fetching of wellbeing setting to activity
* Add wellbeing option to statusDisplayOptions
* Update post filters for all accounts
* Remove local translations
* Revert "Remove local translations"
This reverts commit e92e636a5c759b09649174ab68ec91bc13680287.
* Remove german translations
2020-12-23 19:13:37 +01:00
b91a0aceeb
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
2020-12-23 12:52:39 +01:00
171f69a35d
Merge remote-tracking branch 'tuskyapp/develop'
2020-11-20 13:21:21 +09:00
2170e6b0fa
Perform bidirectionality isolation manually instead of relying on `BidiFormatter` ( #1976 )
...
* Perform manual isolation of display names etc. instead of relying on BidiFormatter.
Fixes #1921
* Make follow request notification header formatting more like other notifications
2020-11-04 18:21:41 +01:00
79ddb9b67c
Merge remote-tracking branch 'tuskyapp/develop' into master
2020-08-01 21:40:50 +09:00
4205f5493e
Make account views clickable instead of avatar only ( #1855 )
...
Affects:
- New follower request and New follower notifications
- Accounts in Blocked users and Muted users pages
2020-07-07 20:35:31 +02:00
0e8aa1f48b
Merge remote-tracking branch 'tuskyapp/develop'
2020-05-16 18:01:15 +09:00
3a912cf7a9
Remove string-based quote feature
2020-05-16 17:47:53 +09:00
2fc7ad13bb
CustomEmojiHelper: rewrite to Kotlin ( #1787 )
...
* CustomEmojiHelper: rewrite to Kotlin
* CustomEmojiHelper: PR fixes
2020-05-15 22:09:12 +02:00
ca65c5e26f
Merge remote-tracking branch 'tuskyapp/develop'
2020-05-04 10:52:47 +09:00
3c3e872782
fix content warning in notifications when alwaysShowSpoiler is on ( #1757 )
2020-04-18 13:45:07 +02:00
2cf1e366b8
convert MainActivity to Kotlin and upgrade MaterialDrawer to version 8 ( #1748 )
...
* convert MainActivity to Kotlin
* migrate to MaterialDrawer 8
* fix drawer styles
* revert removing BezelImageView and material_drawer_header override
* fix tests
* add lost comment back to material_drawer_header.xml
* add tools:parentTag to material_drawer_header.xml
* use when instead of if in MainActivity
* fix statusbar color over the drawer
* cleanup drawer item creation
* tint secondary drawer items as well
* remove unnecessary ids
* fix header text color in the light theme
* improve header text contrast
2020-04-15 18:57:53 +02:00
1370eedc10
Merge remote-tracking branch 'tuskyapp/develop'
2020-04-09 00:34:31 +09:00
4a4dd4f30f
Add notifications for follow requests ( #1729 )
...
* Add notifications for follow requests
Issue #1719
* Revert item_follow_request layout, create new layout for follow request notifications
* Migrate follow request interaction from notification to observable pattern
* Filter follow request notifications by default
* Add missing cases for system notification generation
* Format code
2020-03-19 22:02:10 +01:00
kyori19
Konrad Pozniak
Nik Clayton
Levi Bard
Josh Soref
Mélanie Chauvel
Colin Kinloch
Ivan Kupalov
Zero King
Alibek Omarov
Garrit Franke