kyori19 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
..
AccountAdapter.kt	Convert AccountViewHolder from Java to Kotlin (#3044)	2022-12-28 19:07:43 +01:00
AccountFieldEditAdapter.kt	Handle even more instance defaults (#2612)	2022-07-26 20:24:50 +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
BlocksAdapter.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
FollowAdapter.kt	Convert AccountViewHolder from Java to Kotlin (#3044)	2022-12-28 19:07:43 +01:00
FollowRequestViewHolder.kt	Convert AccountViewHolder from Java to Kotlin (#3044)	2022-12-28 19:07:43 +01:00
FollowRequestsAdapter.kt	Convert AccountViewHolder from Java to Kotlin (#3044)	2022-12-28 19:07:43 +01:00
FollowRequestsHeaderAdapter.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
ListSelectionAdapter.kt	migrating to ViewBinding part 4: Adapters (#2095)	2021-03-07 19:24:01 +01:00
LoadingFooterViewHolder.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
LocaleAdapter.kt	Convert util/{HttpHeaderLink,PairedList,TimestampUtils,ThemeUtils} to Kotlin (#3046)	2022-12-31 13:01:35 +01:00
MutesAdapter.kt	Improve muted users list (#3127)	2023-01-02 14:09:40 +01:00
NotificationsAdapter.java	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
PlaceholderViewHolder.kt	Keep scroll position when loading missing statuses (#3000)	2023-01-13 19:26:24 +01:00
PollAdapter.kt	show status edits (#3049)	2023-01-02 14:09:18 +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	Convert util/{HttpHeaderLink,PairedList,TimestampUtils,ThemeUtils} to Kotlin (#3046)	2022-12-31 13:01:35 +01:00
StatusBaseViewHolder.java	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
StatusDetailedViewHolder.java	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
StatusViewHolder.java	Add option to not crop image previews (#2832)	2022-12-01 21:20:46 +01:00
TabAdapter.kt	Show a close button for hashtag tab chips (#3140)	2023-01-09 21:24:37 +01:00