9b5f176008
Merge remote-tracking branch 'tuskyapp/develop'
2023-12-08 02:14:28 +09:00
131ebabe85
Add support for v2/instance ( #4062 )
...
…with fallback to v1
2023-10-25 12:53:10 +02:00
fa80a0123a
Add "Trending posts" (statuses) feed ( #4007 )
...
Add "Trending posts" (statuses) feed.
This feed is a good source of interesting accounts to follow and,
personally, a sort of "Front page of the Fediverse".
Since #3908 and #3910 (which would provide a more thorough, albeit
complex, access to trending things) won't get merged, I'd like to
address this missing feed by simply adding another tab/feed.
~~If desired, I can move the second commit (fixing lint) to another
PR.~~
## Screenshots
### Tab
<img
src="https://github.com/tuskyapp/Tusky/assets/1063155/6a71a97e-673e-44c7-b67d-9b1df0bed4f5 "
width=320 /> <img
src="https://github.com/tuskyapp/Tusky/assets/1063155/9bf60b23-d2f3-4dd8-8af6-e96647b02121 "
width=320 />
### Activity
<img
src="https://github.com/tuskyapp/Tusky/assets/1063155/4e07dea3-d97f-42c6-8551-492a3116fcfa "
width=320 /> <img
src="https://github.com/tuskyapp/Tusky/assets/1063155/ad00a134-d622-43f4-8305-84cfa7fed706 "
width=320 />
2023-09-14 22:37:41 +02:00
70d86345a8
3891: Match (only) title for muting state
2023-08-24 15:00:52 +02:00
35fd702472
3891: Remove unnecessary if (use "this.hashtag" consistently)
2023-08-15 09:09:59 +02:00
6bd1c234d2
3891: Change length to short consistently
2023-08-15 09:09:59 +02:00
96028c841a
3891: (use string templates)
2023-08-15 09:09:59 +02:00
e5456b0197
3891: Directly start the edit filter activity
2023-08-15 09:09:59 +02:00
a883ec71d5
3891: Only mute the actual hashtag (with #)
2023-08-15 09:09:58 +02:00
b0a50f9f50
3891: Add feedback (snackbars) for hashtag actions
2023-08-15 09:09:58 +02:00
4b9fb2f0bb
Merge remote-tracking branch 'tuskyapp/develop'
...
# Conflicts:
# .gitignore
# README.md
# app/build.gradle
# app/src/green/res/mipmap-hdpi/ic_launcher.png
# app/src/green/res/mipmap-mdpi/ic_launcher.png
# app/src/green/res/mipmap-xhdpi/ic_launcher.png
# app/src/green/res/mipmap-xxhdpi/ic_launcher.png
# app/src/green/res/mipmap-xxxhdpi/ic_launcher.png
# app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
# app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
# app/src/main/java/com/keylesspalace/tusky/StatusListActivity.kt
# app/src/main/java/com/keylesspalace/tusky/TabData.kt
# app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
# app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
# app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt
# 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/conversation/ConversationEntity.kt
# app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
# app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineTypeMappers.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/TimelineDao.kt
# app/src/main/java/com/keylesspalace/tusky/db/TimelineStatusEntity.kt
# app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt
# app/src/main/java/com/keylesspalace/tusky/di/FragmentBuildersModule.kt
# app/src/main/java/com/keylesspalace/tusky/di/ViewModelFactory.kt
# app/src/main/java/com/keylesspalace/tusky/entity/NewStatus.kt
# app/src/main/java/com/keylesspalace/tusky/entity/Status.kt
# app/src/main/java/com/keylesspalace/tusky/entity/TimelineAccount.kt
# app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
# app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt
# app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt
# app/src/main/java/com/keylesspalace/tusky/util/StatusDisplayOptions.kt
# app/src/main/java/com/keylesspalace/tusky/util/StatusParsingHelper.kt
# app/src/main/res/layout/activity_about.xml
# app/src/main/res/layout/activity_main.xml
# app/src/main/res/layout/item_status.xml
# app/src/main/res/layout/item_status_notification.xml
# app/src/main/res/values-ar/strings.xml
# app/src/main/res/values-be/strings.xml
# app/src/main/res/values-bn-rBD/strings.xml
# app/src/main/res/values-ca/strings.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-eu/strings.xml
# app/src/main/res/values-fa/strings.xml
# app/src/main/res/values-fr/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-in/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-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-oc/strings.xml
# app/src/main/res/values-pl/strings.xml
# app/src/main/res/values-pt-rBR/strings.xml
# app/src/main/res/values-ru/strings.xml
# app/src/main/res/values-sa/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/attrs.xml
# app/src/main/res/values/styles.xml
# app/src/main/res/values/theme_colors.xml
# app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt
# app/src/test/java/com/keylesspalace/tusky/FilterV1Test.kt
# app/src/test/java/com/keylesspalace/tusky/components/timeline/StatusMocker.kt
# app/src/test/java/com/keylesspalace/tusky/db/TimelineDaoTest.kt
# app/src/test/java/com/keylesspalace/tusky/usecase/TimelineCasesTest.kt
# app/src/test/java/com/keylesspalace/tusky/util/RickRollTest.kt
# assets/tusky_banner.xcf
# fastlane/metadata/android/ca/changelogs/58.txt
# fastlane/metadata/android/ca/full_description.txt
# fastlane/metadata/android/de/changelogs/58.txt
# fastlane/metadata/android/de/changelogs/61.txt
# fastlane/metadata/android/de/changelogs/67.txt
# fastlane/metadata/android/de/changelogs/68.txt
# fastlane/metadata/android/de/changelogs/70.txt
# fastlane/metadata/android/de/changelogs/72.txt
# fastlane/metadata/android/de/changelogs/74.txt
# fastlane/metadata/android/de/changelogs/77.txt
# fastlane/metadata/android/de/changelogs/80.txt
# fastlane/metadata/android/de/changelogs/82.txt
# fastlane/metadata/android/de/changelogs/83.txt
# fastlane/metadata/android/de/changelogs/87.txt
# fastlane/metadata/android/de/changelogs/89.txt
# fastlane/metadata/android/de/changelogs/94.txt
# fastlane/metadata/android/de/full_description.txt
# fastlane/metadata/android/de/short_description.txt
# fastlane/metadata/android/fa/changelogs/58.txt
# fastlane/metadata/android/it/changelogs/58.txt
# gradle.properties
# gradle/libs.versions.toml
# instance-build.gradle
2023-06-02 00:54:05 +09:00
d839f18267
update ktlint plugin to 11.3.1, format code ( #3442 )
2023-03-13 13:16:39 +01:00
ff8dd37855
Support the mastodon 4 filter api ( #3188 )
...
* Replace "warn"-filtered posts in timelines and thread view with placeholders
* Adapt hashtag muting interface
* Rework filter UI
* Add icon for account preferences
* Clean up UI
* WIP: Use chips instead of a list. Adjust padding
* Scroll the filter edit activity
Nested scrolling views (e.g., an activity that scrolls with an embedded list
that also scrolls) can be difficult UI.
Since the list of contexts is fixed, replace it with a fixed collection of
switches, so there's no need to scroll the list.
Since the list of actions is only two (warn, hide), and are mutually
exclusive, replace the spinner with two radio buttons.
Use the accent colour and title styles on the different heading titles in
the layout, to match the presentation in Preferences.
Add an explicit "Cancel" button.
The layout is a straightforward LinearLayout, so use that instead of
ConstraintLayout, and remove some unncessary IDs.
Update EditFilterActivity to handle the new layout.
* Cleanup
* Add more information to the filter list view
* First pass on code review comments
* Add view model to filters activity
* Add view model to edit filters activity
* Only use the status wrapper for filtered statuses
* Relint
---------
Co-authored-by: Nik Clayton <nik@ngo.org.uk>
2023-03-11 13:12:50 +01:00
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
5be9a90333
Merge remote-tracking branch 'tuskyapp/develop'
2022-12-29 22:53:20 +09:00
51d02388b9
Fix tests ( #3022 )
2022-12-08 09:58:58 +01:00
424326f99f
Add a menu option to mute / filter a hashtag from a status list ( #2882 )
...
* Add a menu option to mute / filter a hashtag from a status list
Un/muting uses the "home" filter
* Set the initial mute button visibility from existing filters
Check the user's filters to see if the tag is already filtered from HOME.
If it is then the initial button is to unmute it. If it isn't then the
initial button is to mute it.
* Avoid "mute tag" menu items "popping" in
- Initial state shows the "mute" option, disabled
- Update the state after the API call completes
2022-12-05 14:36:30 +01:00
c7a91fb1df
Apply ktlint and add to CI
2022-11-12 04:36:13 +09:00
004a9b4921
Merge remote-tracking branch 'tuskyapp/develop'
2022-11-12 04:35:49 +09:00
042176e523
Add support for following hashtags ( #2642 )
...
* Add support for following hashtags. Addresses #2637
* Update rxjava to coroutines
* Update new tag api to use suspend functions
* Update hashtag unfollow icon
* Set correct tint on hashtag follow/unfollow icons
* Translate hashtag follow/unfollow error messages
* Toast => Snackbar
* Remove unnecessary view lookup
2022-08-07 19:09: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
4c9cd4084b
show list title when viewing list timeline ( #2503 )
2022-05-17 19:55:26 +02:00
ba005c769b
Merge remote-tracking branch 'tuskyapp/develop'
2022-03-04 17:51:25 +09:00
8e49dd7329
Merge commit '643e012b11f20538fd17aa3ab888d8e739ebd0d0'
2022-03-04 16:29:48 +09:00
f7dfffa762
merge ModalTimelineActivity & ViewTagActivity into StatusListActivity ( #2332 )
...
* Rename .java to .kt
* merge ModalTimelineActivity & ViewTagActivity into StatusListActivity
* fix crash when opening hashtag
2022-02-25 18:57:31 +01:00
643e012b11
Timeline paging ( #2238 )
...
* first setup
* network timeline paging / improvements
* rename classes / move to correct package
* remove unused class TimelineAdapter
* some code cleanup
* remove TimelineRepository, put mapper functions in TimelineTypeMappers.kt
* add db migration
* cleanup unused code
* bugfix
* make default timeline settings work again
* fix pinning statuses from timeline
* fix network timeline
* respect account settings in NetworkTimelineRemoteMediator
* respect account settings in NetworkTimelineRemoteMediator
* update license headers
* show error view when an error occurs
* cleanup some todos
* fix db migration
* fix changing mediaPreviewEnabled setting
* fix "load more" button appearing on top of timeline
* fix filtering and other bugs
* cleanup cache after 14 days
* fix TimelineDAOTest
* fix code formatting
* add NetworkTimeline unit tests
* add CachedTimeline unit tests
* fix code formatting
* move TimelineDaoTest to unit tests
* implement removeAllByInstance for CachedTimelineViewModel
* fix code formatting
* fix bug in TimelineDao.deleteAllFromInstance
* improve loading more statuses in NetworkTimelineViewModel
* improve loading more statuses in NetworkTimelineViewModel
* fix bug where empty state was shown too soon
* reload top of cached timeline on app start
* improve CachedTimelineRemoteMediator and Tests
* improve cached timeline tests
* fix some more todos
* implement TimelineFragment.removeItem
* fix ListStatusAccessibilityDelegate
* fix crash in NetworkTimelineViewModel.loadMore
* fix default state of collapsible statuses
* fix default state of collapsible statuses -tests
* fix showing/hiding media in the timeline
* get rid of some not-null assertion operators in TimelineTypeMappers
* fix tests
* error handling in CachedTimelineViewModel.loadMore
* keep local status state when refreshing cached statuses
* keep local status state when refreshing network timeline statuses
* show placeholder loading state in cached timeline
* better comments, some code cleanup
* add TimelineViewModelTest, improve code, fix bug
* fix ktlint
* fix voting in boosted polls
* code improvement
2022-01-11 19:00:29 +01:00
2005b32dfa
Merge remote-tracking branch 'tuskyapp/develop'
2021-07-03 23:59:57 +09:00
16ffcca748
add ktlint plugin to project and apply default code style ( #2209 )
...
* add ktlint plugin to project and apply default code style
* some manual adjustments, fix wildcard imports
* update CONTRIBUTING.md
* fix formatting
2021-06-28 21:13:24 +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
609dcf46cb
Merge remote-tracking branch 'tuskyapp/develop'
2021-04-28 11:54:29 +09:00
ff69a2ad0d
migrating to ViewBinding part 2: Activities ( #2093 )
2021-03-07 19:05:51 +01:00
a746009f74
Merge remote-tracking branch 'tuskyapp/develop'
2021-03-04 15:08:48 +09:00
483beaa957
move onOptionsItemSelected to BaseActivity ( #2059 )
...
* move onOptionsItemSelected to BaseActivity
* revert change in ComposeActivity
2021-01-31 20:27:02 +01:00
025ba68df4
Refactor quick compose
...
* Stash visibility while composing reply
* Remove announcements
2020-09-08 02:04:56 +09:00
bf5e0a4b81
Show announcements
2020-01-28 01:11:10 +09:00
f3d820a8d7
Add FAB to StatusListActivity
2019-11-19 23:51:58 +09:00
fb3263b76d
Merge remote-tracking branch 'tuskyapp/develop'
2019-11-19 23:42:22 +09:00
d9694df0c2
Bookmarks ( #1560 )
...
* add bookmarks to timelines
* add Bookmarks to main menu
* cleanup
* handle BookmarkEvent
* fix tests
* fix bookmark handling in NotificationsFragment
* add bookmark accessibility actions
2019-11-19 10:15:32 +01:00
kyori19
Levi Bard
Angelo Suzuki
Lakoja
Konrad Pozniak
Nik Clayton
Ivan Kupalov
kyori19