kyori19 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
..
AccountFieldEditAdapter.kt	Fix ArrayIndexOutOfBoundsException (#3808)	2023-07-06 19:57:35 +02:00
AccountSelectionAdapter.kt	Don't display bot badge in account selection dialog (#2589)	2022-06-20 16:11:07 +02:00
AccountViewHolder.kt	Convert AccountViewHolder from Java to Kotlin (#3044)	2022-12-28 19:07:43 +01:00
EmojiAdapter.kt	respect "animate emojis" setting in emoji picker (#2996)	2022-12-05 19:15:28 +01:00
FollowRequestViewHolder.kt	Make links in bios of follow request and follow notifications work (#3646)	2023-05-13 15:32:56 +02:00
LocaleAdapter.kt	Convert util/{HttpHeaderLink,PairedList,TimestampUtils,ThemeUtils} to Kotlin (#3046)	2022-12-31 13:01:35 +01:00
PlaceholderViewHolder.kt	Keep scroll position when loading missing statuses (#3000)	2023-01-13 19:26:24 +01:00
PollAdapter.kt	update ktlint plugin to 11.3.1, format code (#3442)	2023-03-13 13:16:39 +01:00
PreviewPollOptionsAdapter.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
ReportNotificationViewHolder.kt	update ktlint plugin to 11.3.1, format code (#3442)	2023-03-13 13:16:39 +01:00
StatusBaseViewHolder.java	Merge remote-tracking branch 'tuskyapp/develop'	2023-07-19 21:14:48 +09:00
StatusDetailedViewHolder.java	Merge remote-tracking branch 'tuskyapp/develop'	2023-06-02 00:54:05 +09:00
StatusViewHolder.java	Replace shortNumber() with formatNumber() (#3519)	2023-06-10 16:29:26 +02:00
TabAdapter.kt	Fix crash after resuming app	2023-07-19 20:41:13 +09:00