kyori19
57aab71b0e
Merge remote-tracking branch 'tuskyapp/develop'
...
# Conflicts:
# app/build.gradle
# app/src/main/java/com/keylesspalace/tusky/SplashActivity.kt
# app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
# 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/conversation/ConversationViewHolder.java
# app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
# app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineTypeMappers.kt
# app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt
# app/src/main/res/layout/activity_main.xml
# app/src/main/res/values-cs/strings.xml
# app/src/main/res/values-de/strings.xml
# app/src/main/res/values-fa/strings.xml
# app/src/main/res/values-fr/strings.xml
# app/src/main/res/values-hu/strings.xml
# app/src/main/res/values-it/strings.xml
# app/src/main/res/values-no-rNB/strings.xml
# app/src/main/res/values-zh-rCN/strings.xml
2022-07-16 02:51:51 +09:00
Konrad Pozniak
f419e83c16
improve logout ( #2579 )
...
* improve logout
* fix tests
* add db migration
* delete wrongly committed file again
* improve LogoutUsecase
2022-06-20 16:45:54 +02:00
kyori19
95a1f5632b
Merge remote-tracking branch 'tuskyapp/develop'
2022-05-01 19:54:22 +09:00
kyori19
ba005c769b
Merge remote-tracking branch 'tuskyapp/develop'
2022-03-04 17:51:25 +09:00
kyori19
8e49dd7329
Merge commit '643e012b11f20538fd17aa3ab888d8e739ebd0d0'
2022-03-04 16:29:48 +09:00
Konrad Pozniak
2960a85ff1
use ViewData only instead of Pair<Status, ViewData> in Search ( #2336 )
2022-02-25 18:57:49 +01:00
Konrad Pozniak
329df1280b
fix sensitive media in search and notifications ( #2335 )
2022-02-12 09:56:08 +01:00
Konrad Pozniak
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
kyori19
2005b32dfa
Merge remote-tracking branch 'tuskyapp/develop'
2021-07-03 23:59:57 +09:00
Konrad Pozniak
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
Konrad Pozniak
6d4f5ad027
migrate to paging 3 ( #2182 )
...
* migrate conversations and search to paging 3
* delete SearchRepository
* remove unneeded executor from search
* fix bugs in conversations
* update license headers
* fix conversations refreshing
* fix search refresh indicators
* show fullscreen loading while conversations are empty
* search bugfixes
* error handling
* error handling
* remove mastodon bug workaround
* update ConversationsFragment
* fix conversations more menu and deleting conversations
* delete unused class
* catch exceptions in ConversationsViewModel
* fix bug where items are not diffed correctly / cleanup code
* fix search progressbar display conditions
2021-06-17 18:54:56 +02:00
Ivan Kupalov
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
Konrad Pozniak
40b24cd242
migrate to RxJava3 ( #2146 )
...
* migrate to RxJava3
* remove unused import
2021-05-16 19:53:27 +02:00
Konrad Pozniak
b156be6ded
work around mastodon mute bug ( #2150 )
2021-05-09 18:37:41 +02:00
kyori19
a746009f74
Merge remote-tracking branch 'tuskyapp/develop'
2021-03-04 15:08:48 +09:00
Levi Bard
be60155de5
Implement timed mutes. ( #2035 )
...
Fixes #2033
2021-01-15 21:05:36 +01:00
kyori19
79ddb9b67c
Merge remote-tracking branch 'tuskyapp/develop' into master
2020-08-01 21:40:50 +09:00
Mélanie Chauvel
b3b4794a2b
Implement optional notifications muting for account muting ( #1856 )
2020-07-27 10:28:59 +02:00
kyori19
3a912cf7a9
Remove string-based quote feature
2020-05-16 17:47:53 +09:00
kyori19
1370eedc10
Merge remote-tracking branch 'tuskyapp/develop'
2020-04-09 00:34:31 +09:00
Levi Bard
91263eed8b
Confirm blocks and mutes from timelines ( #1740 )
...
* Add preference for confirming blocks and mutes from timelines
Implements #1737
* Apply code review feedback
2020-03-30 21:03:27 +02:00
Levi Bard
8cb83050ac
Add support for muting conversations ( #1732 )
...
* Add support for muting conversations
Implements #1731
* Fix CI
* Apply code review feedback
2020-03-24 21:06:04 +01:00
kyori19
cc31f7af70
Merge remote-tracking branch 'tuskyapp/develop'
2020-01-17 14:14:15 +09:00
Konrad Pozniak
7cb76aad97
Fix search bugs ( #1624 )
...
* fix toggling media visibility
* cleanup search code to make it more readable
* remove redundant OnQueryTextListener
this is the default behavior
* fix bookmarking
* fix status interaction causing unnecessary network requests
2020-01-13 13:57:44 +01:00
kyori19
9efc4a4bc9
Merge remote-tracking branch 'tuskyapp/develop'
2020-01-05 01:02:28 +09:00
Konrad Pozniak
cdb9d87f41
use RxAwareViewModel for more ViewModels ( #1613 )
...
* use RxAwareViewModel for more ViewModels
* fix ReportViewModel
2020-01-02 18:50:58 +01:00
kyori19
fb3263b76d
Merge remote-tracking branch 'tuskyapp/develop'
2019-11-19 23:42:22 +09:00
kyori19
762b2225ca
Merge remote-tracking branch 'tuskyapp/develop'
2019-11-19 21:52:13 +09:00
Konrad Pozniak
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
Konrad Pozniak
d6ec5ca8d3
fix crashes related to missing Rx error handler ( #1561 )
2019-11-17 20:59:13 +01:00
Konrad Pozniak
7bccf23f69
fix null search when refreshing hashtags ( #1562 )
2019-11-17 20:58:54 +01:00
kyori19
6f1c59d031
[notestock] Implement Notestock search
2019-09-05 21:29:45 +09:00
Konrad Pozniak
42a6b98d4d
use status source for delete and redraft ( #1461 )
...
* use status source for delete and redraft
* make delete & redraft work on Pleroma again
* add error handling
2019-08-28 19:54:46 +02:00
Ivan Kupalov
0b29b0330b
Fix search bugs, fix #1403 ( #1440 )
2019-08-04 20:32:44 +02:00
Konrad Pozniak
8834c22120
add option to always expand content warnings ( #1422 )
2019-07-28 19:59:52 +02:00
pandasoft0
3b1288e99c
Improve search results ( #1327 )
...
* Add entities and request for search APIv2
* Implement search adapter and fragment
* Fix issue with snackbar
* Implement search accounts fragment
* Implement generic search fragment
* Remove unneeded import
* Implement "status" actions, fix issues
* Remove SFragment dependency
* Update app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
Co-Authored-By: Konrad Pozniak <connyduck@users.noreply.github.com>
* Clean-up post review suggestions
* Make TabLayout background colour match search bar
* Corrected method call syntax
* Added SwipeRefreshLayout to SearchFragment
* Fixed refresh to update all three tabs
2019-07-19 20:10:20 +02:00