e5d9b56dd0
Merge remote-tracking branch 'tuskyapp/develop'
...
# Conflicts:
# app/build.gradle
# 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/trending/TrendingFragment.kt
# app/src/main/java/com/keylesspalace/tusky/entity/Status.kt
# app/src/main/res/values-be/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-gd/strings.xml
# app/src/main/res/values-ja/strings.xml
# app/src/main/res/values-lv/strings.xml
# app/src/main/res/values-oc/strings.xml
# app/src/main/res/values-sv/strings.xml
# app/src/main/res/values-tr/strings.xml
# app/src/main/res/values-vi/strings.xml
# app/src/main/res/values-zh-rCN/strings.xml
# app/src/main/res/values/donottranslate.xml
# fastlane/metadata/android/en-US/images/phoneScreenshots/01_timeline.png
# fastlane/metadata/android/en-US/images/phoneScreenshots/03_profile.png
# fastlane/metadata/android/en-US/images/phoneScreenshots/04_favourites.png
# fastlane/metadata/android/fa/full_description.txt
# fastlane/metadata/android/sv/changelogs/58.txt
# fastlane/metadata/android/sv/changelogs/67.txt
# fastlane/metadata/android/sv/changelogs/72.txt
# fastlane/metadata/android/sv/changelogs/77.txt
# gradle/libs.versions.toml
2023-07-19 21:14:48 +09:00
e4c2476f34
Retain text in search view when switching tabs before first search ( #3540 )
...
Fixes #3527
2023-07-19 11:40:08 +02:00
6e06e656b4
Make sure the active account is always correctly saved to database ( #3720 )
...
Fixes #3702
2023-06-11 20:24:26 +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
321d17f5de
Remove Rx from EventHub and TimelineCases ( #3446 )
...
* remove Rx from EventHub and TimelineCases
* fix tests
* fix AccountViewModel.unblockDomain
* remove debug logging
2023-03-18 10:11:47 +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
561eda8482
Remove rxjava from deletestatus API ( #3041 )
...
* Remove rxjava from API calls used by AccountListFragment
* Remove rxjava from API calls used by AccountViewModel::changeRelationship()
The affected API functions are also called from
- ReportViewModel.kt
- SearchViewModel.kt
- AccountListFragment.kt
- SFragment.java
- TimelineCases.kt
so they have also been updated.
This change requires bridging from Java code to Kotlin `suspend` functions,
by creating wrappers for the `mute` and `block` functions that can be
called from Java and create a coroutine scope.
I've deliberately made this fairly ugly so that it sticks out and can be
removed later.
* Use "Throwable" type and name
* Delete 46.json
Not sure where this came from.
* Remove rxjava from the deleteStatus call path
* Emit log messages with the correct tag
* Add another log tag, and lint
* Use TAG in log messages now it's present
* Lint
* Move viewModelScope.launch in to changeRelationshop()
* Use onSuccess/onFailure pair instead of fold
* Return Deferred when deleting statuses
2023-01-10 21:20:00 +01:00
a21f2fadf9
Remove rxjava from API calls used by AccountViewModel::changeRelationship() ( #3008 )
...
* Remove rxjava from API calls used by AccountListFragment
* Remove rxjava from API calls used by AccountViewModel::changeRelationship()
The affected API functions are also called from
- ReportViewModel.kt
- SearchViewModel.kt
- AccountListFragment.kt
- SFragment.java
- TimelineCases.kt
so they have also been updated.
This change requires bridging from Java code to Kotlin `suspend` functions,
by creating wrappers for the `mute` and `block` functions that can be
called from Java and create a coroutine scope.
I've deliberately made this fairly ugly so that it sticks out and can be
removed later.
* Use "Throwable" type and name
* Delete 46.json
Not sure where this came from.
* Emit log messages with the correct tag
* Add another log tag, and lint
* Move viewModelScope.launch in to changeRelationshop()
2022-12-28 19:06:31 +01:00
004a9b4921
Merge remote-tracking branch 'tuskyapp/develop'
2022-11-12 04:35:49 +09:00
4665637086
make all model classes immutable ( #2686 )
2022-08-31 18:54:40 +02:00
4f0f9a7a12
update Kotlin to 1.7.10 and fix some (new?) warnings ( #2647 )
...
* update Kotlin to 1.7.10 and fix some (new?) warnings
* remove unused import
2022-08-07 19:36:09 +02:00
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
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
95a1f5632b
Merge remote-tracking branch 'tuskyapp/develop'
2022-05-01 19:54:22 +09: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
2960a85ff1
use ViewData only instead of Pair<Status, ViewData> in Search ( #2336 )
2022-02-25 18:57:49 +01:00
329df1280b
fix sensitive media in search and notifications ( #2335 )
2022-02-12 09:56:08 +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
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
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
40b24cd242
migrate to RxJava3 ( #2146 )
...
* migrate to RxJava3
* remove unused import
2021-05-16 19:53:27 +02:00
b156be6ded
work around mastodon mute bug ( #2150 )
2021-05-09 18:37:41 +02:00
a746009f74
Merge remote-tracking branch 'tuskyapp/develop'
2021-03-04 15:08:48 +09:00
be60155de5
Implement timed mutes. ( #2035 )
...
Fixes #2033
2021-01-15 21:05:36 +01:00
79ddb9b67c
Merge remote-tracking branch 'tuskyapp/develop' into master
2020-08-01 21:40:50 +09:00
b3b4794a2b
Implement optional notifications muting for account muting ( #1856 )
2020-07-27 10:28:59 +02:00
3a912cf7a9
Remove string-based quote feature
2020-05-16 17:47:53 +09:00
1370eedc10
Merge remote-tracking branch 'tuskyapp/develop'
2020-04-09 00:34:31 +09:00
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
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
cc31f7af70
Merge remote-tracking branch 'tuskyapp/develop'
2020-01-17 14:14:15 +09:00
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
9efc4a4bc9
Merge remote-tracking branch 'tuskyapp/develop'
2020-01-05 01:02:28 +09:00
cdb9d87f41
use RxAwareViewModel for more ViewModels ( #1613 )
...
* use RxAwareViewModel for more ViewModels
* fix ReportViewModel
2020-01-02 18:50:58 +01:00
fb3263b76d
Merge remote-tracking branch 'tuskyapp/develop'
2019-11-19 23:42:22 +09:00
762b2225ca
Merge remote-tracking branch 'tuskyapp/develop'
2019-11-19 21:52:13 +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
d6ec5ca8d3
fix crashes related to missing Rx error handler ( #1561 )
2019-11-17 20:59:13 +01:00
7bccf23f69
fix null search when refreshing hashtags ( #1562 )
2019-11-17 20:58:54 +01:00
6f1c59d031
[notestock] Implement Notestock search
2019-09-05 21:29:45 +09:00
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
0b29b0330b
Fix search bugs, fix #1403 ( #1440 )
2019-08-04 20:32:44 +02:00
8834c22120
add option to always expand content warnings ( #1422 )
2019-07-28 19:59:52 +02:00
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
kyori19
UlrichKu
Konrad Pozniak
Nik Clayton
Ivan Kupalov
Levi Bard
Mélanie Chauvel
kyori19
pandasoft0