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
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
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
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
kyori19
Konrad Pozniak
Guntbert Reiter