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
..
avatar_border.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
avatar_default.xml	update minSdkVersion to 21 (#843)	2018-09-16 18:54:12 +02:00
background_circle.xml	Make "Up" and "Overflow" menu icons more visible in AccountProfile (#3272)	2023-02-23 19:30:27 +01:00
background_dialog_activity.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
bot_badge.xml	improve bot badge (#2466)	2022-04-28 20:39:06 +02:00
card_frame.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
card_image_placeholder.xml	Improve link preview cards (#1330)	2019-06-22 08:05:55 +02:00
conversation_thread_line.xml	fix color of conversation_thread_line	2020-02-22 17:56:20 +01:00
description_bg_expanded.xml	Use light/dark mode colors for image description text (#3003)	2022-12-06 20:24:26 +01:00
elephant_error.xml	Error artwork (#1000)	2019-01-28 19:02:31 +01:00
elephant_friend.xml	add new elephant friends (#757)	2018-08-15 20:51:35 +02:00
elephant_friend_empty.xml	Error artwork (#1000)	2019-01-28 19:02:31 +01:00
elephant_offline.xml	Error artwork (#1000)	2019-01-28 19:02:31 +01:00
help_message_background.xml	3408 home help message (#3415)	2023-03-21 19:44:35 +01:00
ic_access_time.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_account_settings.xml	New settings (#891)	2018-11-12 21:09:39 +01:00
ic_add_a_photo_32dp.xml	design the edit profile view	2017-04-30 21:57:15 +02:00
ic_alert_circle.xml	Drafts v2 (#2032)	2021-01-21 18:57:09 +01:00
ic_arrow_upward.xml	Merge remote-tracking branch 'tuskyapp/develop'	2020-02-12 12:16:30 +09:00
ic_attach_file_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_blobmoji.xml	fix the emoji selection dialog	2018-06-25 16:23:43 +02:00
ic_bookmark_24dp.xml	Bookmarks (#1560)	2019-11-19 10:15:32 +01:00
ic_bookmark_active_24dp.xml	Bookmarks (#1560)	2019-11-19 10:15:32 +01:00
ic_bot_24dp.xml	Add bot indicator overlay to avatars (#1173)	2019-04-09 20:13:25 +02:00
ic_briefcase.xml	fix "account moved" on profiles not being clickable (#2438)	2022-04-19 11:10:23 +02:00
ic_bullhorn_24dp.xml	[needs help] Support announcements (#1977)	2020-11-18 21:12:27 +01:00
ic_cancel_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_check_24dp.xml	Follow requests list is available. Closes #222	2017-04-28 23:52:14 -04:00
ic_check_32dp.xml	fix color of check icon in EditProfileActivity (#1320)	2019-06-11 19:48:21 +02:00
ic_check_box_outline_blank_18dp.xml	Create polls (#1452)	2019-08-22 20:30:08 +02:00
ic_check_circle.xml	Upgrade to AndroidX, move to MaterialComponents theme (#953)	2018-12-17 15:25:35 +01:00
ic_clear_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_close_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_create_24dp.xml	add shortcut to ComposeActivity (#1147)	2019-03-30 15:19:02 +01:00
ic_cw_24dp.xml	Added "Warning" icon instead of "CW" text. (#1138)	2019-04-01 19:19:37 +02:00
ic_drag_indicator_24dp.xml	Tab customization & direct messages tab (#1012)	2019-02-12 19:22:37 +01:00
ic_drag_indicator_horiz_24dp.xml	Use light/dark mode colors for image description text (#3003)	2022-12-06 20:24:26 +01:00
ic_edit_24dp.xml	Add support for post edit notifications (#2431)	2022-04-19 11:10:13 +02:00
ic_email_24dp.xml	ComposeActivity improvements (#548)	2018-04-13 22:37:21 +02:00
ic_emoji_24dp.xml	ComposeActivity improvements (#548)	2018-04-13 22:37:21 +02:00
ic_emoji_34dp.xml	fix default emoji font icon not rendering	2020-02-21 18:21:47 +01:00
ic_eye_24dp.xml	fix eye menu icon in thread view (#1372)	2019-07-07 17:57:41 +02:00
ic_favourite_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_favourite_active_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_file_download_black_24dp.xml	(icon) add icon download	2017-05-10 15:24:03 +02:00
ic_filter_24dp.xml	Support the mastodon 4 filter api (#3188)	2023-03-11 13:12:50 +01:00
ic_flag_24dp.xml	Add support for moderation report notifications (#2887)	2022-12-01 20:11:55 +01:00
ic_hashtag.xml	add hashtag tabs (#1145)	2019-03-24 08:59:55 +01:00
ic_hide_media_24dp.xml	fix eye menu icon in thread view (#1372)	2019-07-07 17:57:41 +02:00
ic_home_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_list.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_local_24dp.xml	use material design icon for local timeline tab	2017-04-22 11:32:55 +02:00
ic_lock_open_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_lock_outline_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_logout.xml	New settings (#891)	2018-11-12 21:09:39 +01:00
ic_low_vision_24dp.xml	Merge remote-tracking branch 'tuskyapp/develop'	2020-02-12 12:16:30 +09:00
ic_menu_share_24dp.xml	Enable sharing media directly from Tusky (#852)	2018-10-01 11:50:17 +02:00
ic_missing_description_24dp.xml	2890 show warning on missing description (#2919)	2022-12-06 19:28:44 +01:00
ic_more_horiz_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_music_box_24dp.xml	Add audio support for timelines (#1466)	2019-09-05 21:07:01 +02:00
ic_music_box_preview_24dp.xml	Add support for uploading audio attachments (#1630)	2020-01-16 19:05:52 +01:00
ic_mute_24dp.xml	Makes the toolbar shadow visible for pre-Lollipop android versions and fixes a crash when deleting a draft with no media attached.	2017-07-15 03:10:55 -04:00
ic_notebook.xml	Drafts v2 (#2032)	2021-01-21 18:57:09 +01:00
ic_notifications_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_notifications_active_24dp.xml	Notification bell (#2012)	2020-12-23 12:52:39 +01:00
ic_notifications_off_24dp.xml	Implement optional notifications muting for account muting (#1856)	2020-07-27 10:28:59 +02:00
ic_notoemoji.xml	2019 Emoji Update (#1261)	2019-06-06 21:51:56 +02:00
ic_person_add_24dp.xml	Upgrade to AndroidX, move to MaterialComponents theme (#953)	2018-12-17 15:25:35 +01:00
ic_person_remove_24dp.xml	Add support for following hashtags (#2642)	2022-08-07 19:09:26 +02:00
ic_photo_24dp.xml	Adds option to hide media previews if reduced data usage is desired Closes #56.	2017-06-26 05:15:47 -04:00
ic_play_indicator.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_plus_24dp.xml	Tab customization & direct messages tab (#1012)	2019-02-12 19:22:37 +01:00
ic_poll_24dp.xml	Poll notifications (#1229)	2019-05-02 19:44:35 +02:00
ic_public_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_quote_24dp.xml	Merge remote-tracking branch 'tuskyapp/develop'	2020-02-12 12:16:30 +09:00
ic_quote_disabled_24dp.xml	Merge remote-tracking branch 'tuskyapp/develop'	2020-02-12 12:16:30 +09:00
ic_radio_button_unchecked_18dp.xml	Create polls (#1452)	2019-08-22 20:30:08 +02:00
ic_reblog_18dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_reblog_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_reblog_active_24dp.xml	change active boost icon (#1513)	2019-10-03 18:55:32 +02:00
ic_reblog_direct_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_reblog_private_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_reblog_private_active_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_reblog_unleakable_24dp.xml	Merge remote-tracking branch 'tuskyapp/develop'	2020-02-12 12:16:30 +09:00
ic_reblog_unleakable_active_24dp.xml	Merge remote-tracking branch 'tuskyapp/develop'	2020-02-12 12:16:30 +09:00
ic_reject_24dp.xml	Follow requests list is available. Closes #222	2017-04-28 23:52:14 -04:00
ic_repeat_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_reply_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_reply_all_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_send_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_splash.xml	Merge remote-tracking branch 'tuskyapp/develop'	2022-11-12 04:35:49 +09:00
ic_star_24dp.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
ic_tabs.xml	add icon for tabs preference (#1892)	2020-08-17 21:21:03 +02:00
ic_trending_up_24px.xml	Add trending tags (#3149)	2023-02-14 19:52:11 +01:00
ic_twemoji.xml	fix the emoji selection dialog	2018-06-25 16:23:43 +02:00
ic_unmute_24dp.xml	Makes the toolbar shadow visible for pre-Lollipop android versions and fixes a crash when deleting a draft with no media attached.	2017-07-15 03:10:55 -04:00
ic_videocam_24dp.xml	Adds option to hide media previews if reduced data usage is desired Closes #56.	2017-06-26 05:15:47 -04:00
info_24dp.xml	show rules on the login screen (#2746)	2022-11-05 17:37:20 +01:00
materialdrawer_shape_large.xml	make avatar images in drawer rounded squares (#1388)	2019-07-16 19:26:41 +02:00
materialdrawer_shape_small.xml	make avatar images in drawer rounded squares (#1388)	2019-07-16 19:26:41 +02:00
media_preview_outline.xml	give media previews a rounded outline (#1617)	2020-01-03 20:22:16 +01:00
media_warning_bg.xml	issue 2890: Add an "ALT" sticker to the media preview container (#2942)	2022-12-18 16:50:30 +01:00
play_indicator_overlay.xml	Add option to not crop image previews (#2832)	2022-12-01 21:20:46 +01:00
poll_option_background.xml	give poll result backgrounds a rounded shape (#1626)	2020-01-07 19:38:32 +01:00
poll_option_shape.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
profile_badge_background.xml	Theme refactoring (#1656)	2020-01-30 21:37:28 +01:00
quote_inline_frame.xml	[quote] Implement quote feature	2019-09-03 23:08:13 +09:00
report_success_background.xml	Redesign report activity (#1295)	2019-06-09 16:55:34 +02:00
round_button.xml	Add RoundedImageView for avatars (#739)	2018-07-30 15:36:22 +02:00
spellcheck.xml	Fix line endings in spellcheck.xml	2019-02-26 18:34:29 +01:00
status_divider.xml	[Tusky10] adjust poll result background, status divider & button outline color (#1685)	2020-02-14 19:03:18 +01:00