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
62c4cfde89
improve media upload error messages ( #2602 )
2022-06-30 20:51:05 +02:00
3ca8a0b549
Use specific term "image" in error UI, not "attachment" ( #2592 )
...
The new message for the crop feature, "The attachment could not be edited.", turned out to be awkward in some languages (French) where according to the translator it would be better to more specifically say "The image could not be edited." (as currently we can only edit images). Patch replaces error_media_edit_failed with a error_image_edit_failed and deletes the existing error_media_edit_failed-s.
2022-06-21 22:14:11 +02:00
530eb61505
Use NetworkResult in MediaUploadApi ( #2577 )
2022-06-06 16:04:33 +02:00
e1c8461423
replace kotlin-result-calladapter with networkresult-calladapter ( #2569 )
...
* replace kotlin-result-calladapter with networkresult-calladapter
* fix tests
2022-05-30 20:03:40 +02:00
00c139190e
Ability to crop images attached to posts ( #2531 )
...
* First attachment crop attempt: Can crop in place, but does not delete/replace on server so has no effect
* Attachment crop feature works
* ktlint fixes on attachment crop patch
* Upgrade Android-Image-Cropper to 4.2.1
* An error message should be displayed if attachment cropping fails and it is not because the user intentionally cancelled.
* Remove 2 of the 3 "state passing" variables by using MediaUtils
* Cropper should use content uri (MIME type bearing) and setOutputCompressFormat so that PNGs reach the server safely.
* Change to crop requested by Conny: Store inflight cropImageItemOld in view model
* Change to crop requested by Conny: Sort cropImage with the other contracts
* ktlint fixes on attachment crop patch (again)
2022-05-22 21:01:14 +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
0ef03e2bec
Merge commit '0f1e95d0ca81d0254f8d1ae6b60a3130d51b15cf'
2022-05-19 00:15:17 +09:00
cec8f6dd65
modernize autocomplete ( #2510 )
...
* modernize autocomplete
* use @WorkerThread annotation
2022-05-17 19:55:37 +02:00
d9c6269d44
fix deleting media attachments removing the wrong ones ( #2517 )
2022-05-12 18:21:43 +02:00
beaed6b875
Fix crash when saving redrafted media to drafts ( #2502 )
...
* fix crash when saving draft from redraft
* fix crash when saving draft from redraft
* replace ... with …
2022-05-09 19:39:43 +02:00
444e7365c9
fix race condition where multiple uploaded media can get same internal id ( #2479 )
...
* fix race condition where multiple uploaded media can get same internal id
* atomically update media stateflow
* atomically update media stateflow
2022-05-03 19:12:35 +02:00
ce5ec15ff1
increase timeout for media uploads ( #2489 )
2022-05-01 17:16:22 +02:00
95a1f5632b
Merge remote-tracking branch 'tuskyapp/develop'
2022-05-01 19:54:22 +09:00
9a8dfaa744
Remove code to check the server version ( #2469 )
...
solves #2439
2022-04-29 18:35:25 +02:00
671d2c6a45
Check if media processing finished before sending status ( #2458 )
...
* make MastodonApi.createStatus suspending
* check if media processing has finished before sending status
* add backoff for retrying processed media check
2022-04-28 20:37:31 +02:00
f15b3e61bb
New emoji picker ( #2395 )
...
* Update to Emoji2
* Hopefully fix the emoji picker preference
* Switch to released Filemojicompat version
* Filemojicompat version as an own var
* Remove an unused import
* Small cleanup
* Correct onDisplayPreferenceDialog; test TuskyApplication
* Use TextViews instead of EmojiTextViews
* Recreate the Main Activity if the emoji pack is updated
* Enable coreLibraryDesugaring (for Java Streams); update Filemojicompat, downgrade Emoji2
* Update emoji font versions to 14
* Use FilemojiCompat 3.2.0-beta01
* Make ktLint happy again
* Remove coreLibraryDesugaring and a FIXME
* Use EmojiPickerPreference.get()
* Disable emoji pack import
* Update FilemojiCompat to Beta 2
* Update FilemojiCompat to Beta 3
* Update FilemojiCompat to Beta 3.2.0 final
* Update FilemojiCompat to 3.2.1
2022-04-26 18:50:58 +02:00
6c630e08dd
Merge remote-tracking branch 'tuskyapp/develop'
2022-04-24 16:42:54 +09:00
d2bfceae7b
refactor compose & announcements to coroutines ( #2446 )
...
* refactor compose & announcements to coroutines
* fix code formatting
* add javadoc to InstanceInfoRepository
* fix comments in ImageDownsizer
* remove unused Either extensions
* add explicit return type for InstanceInfoRepository.getEmojis
* make ComposeViewModel.pickMedia return Result
* cleanup code in ImageDownsizer
2022-04-21 18:46:21 +02:00
3e8c6a318a
introduce KotlinResultCallAdapter for nice suspending network calls ( #2415 )
...
* introduce KotlinResultCallAdapter for nice suspending network calls
* fix tests
2022-04-14 19:49:49 +02:00
1228f645a6
Merge remote-tracking branch 'tuskyapp/develop'
2022-04-13 00:59:06 +09:00
c47804997c
Improve handling of shared media ( #2388 )
...
* support file:// uris
* support subjects on image shares
* improve code
* improve code
* improve code
2022-03-28 18:39:05 +02:00
2fc3ba3cee
Replace “status” by “post” in strings name and source values ( #2405 )
2022-03-27 12:23:25 +02:00
bbd818084d
When calculating post length, count all urls as being of the reserved character count, even if they're shorter. ( #2404 )
...
Addresses #2399
2022-03-24 19:52:18 +01:00
d9931e3d2c
Rename Toots to Posts ( #2396 )
...
* rename toots -> posts in strings
* extract tusky_compose_post_quicksetting_label string
* rename toot -> status in code
2022-03-20 20:21:42 +01: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
55513e8e2b
Android 12 support, update AndroidX libraries ( #2367 )
...
* Android 12 support, update AndroidX libraries
* fix ktlint
* add Android 12 splash screen support
* fix comments in MainActivity
* remove deprecated Intent.ACTION_CLOSE_SYSTEM_DIALOGS
* delete TimelineViewModelTest
* fix notifications on Android 12
* improve splash screen
* handle pending intent flags in a dedicated function
2022-03-09 20:50:23 +01:00
ba005c769b
Merge remote-tracking branch 'tuskyapp/develop'
2022-03-04 17:51:25 +09:00
7114575497
Instance configuration: the easy parts ( #2341 )
...
* Add data model for instance configuration
* Support instance.configuration.statuses.max_characters
* Support instance.configuration.statuses.characters_reserved_per_url
* Support instance.configuration.polls.max_options and max_characters_per_option
* Pacify ktlint
* Support instance-configured poll durations
* Fixup versions for migration after rebase
2022-03-01 19:43:36 +01:00
eea81d7106
use POST api/v2/media to upload media ( #2327 )
2022-02-25 18:57:18 +01:00
c8ed6b482e
increase default poll max option chars from 25 to 50 ( #2343 )
...
25 is old Mastodon default, the new one is 50
2022-02-18 20:08:38 +01:00
e29567c9ec
Cleanup dagger setup ( #2300 )
...
* cleanup dagger setup
* fix tests
* fix ktlint
* cleanup FragmentBuildersModule
2022-01-23 20:24:55 +01:00
2005b32dfa
Merge remote-tracking branch 'tuskyapp/develop'
2021-07-03 23:59:57 +09:00
2cc53d6772
fix codestyle
2021-06-28 22:04:34 +02: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
f6dd131b95
migrate drafts to paging 3 ( #2206 )
...
* migrate drafts to paging 3
* migrate DraftHelper to coroutines
2021-06-24 21:23:29 +02:00
3301643c1d
update to SDK 30 and fix deprecations ( #2173 )
...
* update to SDk 30 and fix deprecations
* remove unnecessary .run
* revert ViewMediaActivity change
2021-06-01 19:46:07 +02:00
ca5c455881
update AndroidX, use ActivityResultContracts ( #2170 )
...
* update AndroidX, use ActivityResultContracts
* make allowMultiple setable in PickMediaFiles
* add license headers to PickMediaFiles
2021-05-22 17:50:08 +02:00
81057213db
don't upscale images in caption dialog ( #2165 )
...
* don't upscale images in caption dialog
* don't upscale images in caption dialog
2021-05-21 17:52:03 +02:00
751109ac39
upgrade kotlin to 1.5.0 ( #2162 )
...
* upgrade kotlin to 1.5.0
* don't explicitly set kotlin jvmtarget
2021-05-21 17:51:35 +02:00
40b24cd242
migrate to RxJava3 ( #2146 )
...
* migrate to RxJava3
* remove unused import
2021-05-16 19:53:27 +02:00
6c37cc770c
remove SavedToots ( #2141 )
...
* remove SavedToots
* fix tests
2021-05-16 19:17:56 +02:00
076a2b248a
fix crash when captioning large images ( #2149 )
2021-05-06 07:33:15 +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
f293670c14
migrating to ViewBinding part 6: the final cleanup ( #2117 )
2021-03-21 12:42:28 +01:00
0b86f58139
convert some regular strings to plural strings ( #2100 )
...
* convert some regular strings to plural strings
* convert hint_describe_for_visually_impaired from string to plurals
* fix ukrainian strings
2021-03-07 19:43:25 +01:00
fc4b47aee4
migrating to ViewBinding part 4: Adapters ( #2095 )
2021-03-07 19:24:01 +01:00
ff69a2ad0d
migrating to ViewBinding part 2: Activities ( #2093 )
2021-03-07 19:05:51 +01:00
5167b8578e
migrating to ViewBinding part 1: Dialogs + Views ( #2091 )
2021-03-07 19:04:22 +01:00
kyori19
Konrad Pozniak
mcclure
tobi
Guntbert Reiter
Constantin A
Mélanie Chauvel
Levi Bard
Konrad Pozniak