kyori19
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
Konrad Pozniak
d839f18267
update ktlint plugin to 11.3.1, format code ( #3442 )
2023-03-13 13:16:39 +01:00
kyori19
004a9b4921
Merge remote-tracking branch 'tuskyapp/develop'
2022-11-12 04:35:49 +09:00
Konrad Pozniak
1b6a0908f6
Handle even more instance defaults ( #2612 )
...
* handle media size instance limits
* remove unused attributes from Instance entity
* support max_media_attachments
* support pleroma field limits, remove max_bio_chars support
* improve field input margin
* fix tests
* MAX_ACCOUNT_FIELDS -> DEFAULT_MAX_ACCOUNT_FIELDS
* improve "add field" button behavior
* fix copy paste mistake in AccountFieldEditAdapter
* refactor sendStatus to be a suspending function
2022-07-26 20:24:50 +02:00
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
62c4cfde89
improve media upload error messages ( #2602 )
2022-06-30 20:51:05 +02:00
Konrad Pozniak
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
kyori19
bded6a86d6
Merge remote-tracking branch 'tuskyapp/develop'
2022-05-19 21:13:56 +09:00
Konrad Pozniak
5abb82004a
migrate Lists from RxJava to Kotlin coroutines ( #2537 )
...
* migrate Lists from RxJava to Kotlin coroutines
* use DROP_OLDEST when creating MutableSharedFlow
2022-05-18 18:45:35 +02:00
kyori19
6c630e08dd
Merge remote-tracking branch 'tuskyapp/develop'
2022-04-24 16:42:54 +09:00
Konrad Pozniak
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
kyori19
1228f645a6
Merge remote-tracking branch 'tuskyapp/develop'
2022-04-13 00:59:06 +09:00
Konrad Pozniak
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
kyori19
ba005c769b
Merge remote-tracking branch 'tuskyapp/develop'
2022-03-04 17:51:25 +09:00
Konrad Pozniak
a6335e6bcd
update Android Image Cropper and get rid of deprecated onActivityResult ( #2351 )
...
* update Android Image Cropper and get rid of deprecated onActivityResult
* add comment why skipping caches is necessary
* inject application into EditProfileViewModel instead of passing it everytime
2022-03-02 20:39:56 +01:00
Konrad Pozniak
fe350ccf36
move AccountActivity and related classes to a new package ( #2216 )
...
* move AccountActivity and related classes to a new package
* fix ktlint
* fix ktlint
* fix imports
2022-01-11 19:55:17 +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
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
e6c2b2c822
[Proposal] Hide displayName to prevent mistakes
2021-03-04 22:09:54 +09:00
Levi Bard
be60155de5
Implement timed mutes. ( #2035 )
...
Fixes #2033
2021-01-15 21:05:36 +01:00
Alibek Omarov
b91a0aceeb
Notification bell ( #2012 )
...
* Add notification bell button, API endpoints and new relationship field
* Add notification type for subscriptions
* Add subscriptions to legacy notification filtering
* Update schemas
* Fix build
* Make rewrite static method into method of Notification class, fix getNotificationText
* Mastodon wording for subscriptions
2020-12-23 12:52:39 +01:00
Konrad Pozniak
ce973ea7e7
Personal account notes ( #1978 )
...
* add personal notes to AccountActivity
* use RxJava instead of plain okhttp calls
* make AccountViewModel rx aware
* hide note input until data is loaded
2020-11-17 20:10:54 +01:00
Konrad Pozniak
6d27d822ca
update Kotlin to 1.4.10 and fix some warnigs ( #1963 )
2020-10-25 18:36:00 +01:00
Mélanie Chauvel
b3b4794a2b
Implement optional notifications muting for account muting ( #1856 )
2020-07-27 10:28:59 +02:00
Konrad Pozniak
dfd30ec52a
correctly update the menu when muting domains ( #1848 )
2020-06-23 19:59:49 +02: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
Konrad Pozniak
c44dd455b4
Implement identity proof api ( #1597 )
...
* implement identity proof api
* fix warnings in AccountActivity
* fix createClickableText method
* improve error handling
* use combineOptionalLiveData to simplify code
2019-12-21 18:56:16 +01:00
Konrad Pozniak
54a0d5406a
Remove search v1 ( #1484 )
...
* remove search v1, convert MastodonApi to Kotlin
* format MastodonApi nicely
* use default params in ConversationRepository
* improve code for LoginActivity
2019-09-22 08:18:44 +02:00
Levi Bard
ce01e6de22
Add support for instance property `max_bio_chars` ( #1414 )
...
* Migrate getInstance from Call to Single
* Add support for instance max_bio_chars.
Addresses #1329
2019-08-04 20:25:07 +02:00
Konrad Pozniak
d932912616
upgrade dependencies ( #1389 )
2019-07-16 19:36:04 +02:00
Levi Bard
a6819ce28e
Implement instance mutes ( #1311 )
...
* Implement instance mutes. #1143
* Move new classes to instancemute component
* Add progress bar while instance list loads
* Add undo snackbar for instance unmuting
* Update display text for instance mutes
2019-06-11 15:56:27 +02:00
pandasoft0
ae5d8b8633
Account Activity enhancements ( #1196 )
...
* use the "follow" button as an "unblock" button on the profiles of blocked users
* use the "follow" button as an "unblock" button on the profiles of blocked users
* add an icon to the profiles that can be clicked to mute/unmute the user
* add an icon to the profiles that can be clicked to mute/unmute the user
* Fix view issues
* Fix view issues
* Implement swipe to refresh for Account layout
* Implement swipe to refresh handler at the account screen
* Implement swipe to refresh
* Correct account refresh
* Show Progress Bar
* Show Progress Bar
* Move "itSelf" check into the viewModel
* Change methods access level
* Change TimelineFragment newInstance overload
* Change avatarSize type to Float
* Replace ImageButton with MaterialButton
* Update account activity swipe to refresh colors
* Refactor code
* Refactor code
* Fix crash on moved account refresh
* Show moved account stats
* Update mute button behaviour
* Show tabs and content for moved accounts
* Fix crash on tablet
2019-05-15 12:43:16 +02:00
Konrad Pozniak
c410600fe4
fix Glide crash in MainActivity ( #1224 )
2019-04-27 18:20:42 +02:00
Konrad Pozniak
ef66deeae7
fix some lint warnings
2019-04-21 08:24:29 +02:00
Ivan Kupalov
520e0d6e7a
List editing ( #1104 )
...
* List editing groundwork
* Add ability to add/remove accounts from list, delete lists
* Rename list, improve lists UI
* Add error handling, extract strings
* Revert gradle.properties
* Apply feedback suggestions
* Apply feedback
* Update license header
2019-03-16 13:36:16 +01:00
Ivan Kupalov
22ee1dc5df
Fix IDs ( #1016 )
...
* Allow any String IDs as long as they're sortable
* Allow any String IDs as long as they're sortable
2019-01-31 19:03:34 +01:00
Konrad Pozniak
a445c12094
Upgrade to AndroidX, move to MaterialComponents theme ( #953 )
...
* upgrade to AndroidX, upgrade libraries
* move to MaterialComponents theme
* make sure the compose button looks good everywhere
* fix tollbar title/button alignment on tablet
* move to new material color theming, consolidate colors and themes
* fix build, fix imports
* set error on TextInputLayout instead of EditText
* fix imports, TootButton when
* improve snackbar style
* fix task description color
2018-12-17 15:25:35 +01:00
Levi Bard
0bca94b94e
Enable sharing media directly from Tusky ( #852 )
...
* Extract duplicated code into BaseActivity
* Migrate MediaUtils to kotlin
* Migrate ViewVideoActivity to kotlin
* Migrate ViewMediaActivity to kotlin
* Initial media sharing functionality
* Address code review feedback
* Make share icon match
* Address code review feedback
2018-10-01 11:50:17 +02:00
Conny Duck
5621e5d2d4
fix crash when trying to view account with invalid id
...
closes #848
2018-09-15 21:51:53 +02:00
Conny Duck
1d28f4728f
fix crash in EditProfileViewModel
2018-08-26 12:41:26 +02:00
Konrad Pozniak
7442f5bca8
fix bug where deleting profile field was not possible
2018-08-18 09:12:57 +02:00
Konrad Pozniak
f022944e90
add possibility to change profile fields, refactor ( #751 )
...
* refactor EditProfileActivity, add profile fields
* preserve transparency when cropping profile images
* dont validate profile fields on client side
* revert unintentional change in card_frame_dark.xml
* improve activity_edit_profile layout for tablets
* Revert "improve activity_edit_profile layout for tablets"
This reverts commit 20ff3d167c39b15566e017108b33fe58690a8482.
* improve activity_edit_profile layout for tablets
* fix bug in EditProfileActivity, add snackbar
* improve EditProfileActivity code
* use events instead of shared prefs to communicate profile update
2018-08-15 20:47:09 +02:00
Conny Duck
0102a4bd60
fix bug where revoking a follow request was not possible
2018-07-22 14:34:55 +02:00
Konrad Pozniak
63f9d99390
Account activity redesign ( #662 )
...
* Refactor-all-the-things version of the fix for issue #573
* Migrate SpanUtils to kotlin because why not
* Minimal fix for issue #573
* Add tests for compose spanning
* Clean up code suggestions
* Make FakeSpannable.getSpans implementation less awkward
* Add secondary validation pass for urls
* Address code review feedback
* Fixup type filtering in FakeSpannable again
* Make all mentions in compose activity use the default link color
* new layout for AccountActivity
* fix the light theme
* convert AccountActivity to Kotlin
* introduce AccountViewModel
* Merge branch 'master' into account-activity-redesign
# Conflicts:
# app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
* add Bot badge to profile
* parse custom emojis in usernames
* add possibility to cancel follow request
* add third tab on profiles
* add account fields to profile
* add support for moved accounts
* set click listener on account moved view
* fix tests
* use 24dp as statusbar size
* add ability to hide reblogs from followed accounts
* add button to edit own account to AccountActivity
* set toolbar top margin programmatically
* fix crash
* add shadow behind statusbar
* introduce ViewExtensions to clean up code
* move code out of offsetChangedListener for perf reasons
* clean up stuff
* add error handling
* improve type safety
* fix ConstraintLayout warning
* remove unneeded ressources
* fix event dispatching
* fix crash in event handling
* set correct emoji on title
* improve some things
* wrap follower/foillowing/status views
2018-06-18 13:26:18 +02:00