Yuito-app-android/app/src/main/java/com/keylesspalace/tusky
kyori19 f78b41c963
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-05-31 20:39:57 +09:00
..
adapter Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
appstore Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
components Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
db Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
di Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
entity Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
fragment Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
interfaces Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
json update ktlint plugin to 11.3.1, format code (#3442) 2023-03-13 13:16:39 +01:00
network Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
pager Keep the tabs adapter over the life of the viewpager (#3255) 2023-02-15 19:17:59 +01:00
receiver Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
service Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
settings Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
usecase Remove Rx from EventHub and TimelineCases (#3446) 2023-03-18 10:11:47 +01:00
util Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
view Force a layout pass to ensure spans are measured correctly (#3600) 2023-04-30 21:50:52 +02:00
viewdata Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
viewmodel Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
AboutActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
AccountsInListFragment.kt update ktlint plugin to 11.3.1, format code (#3442) 2023-03-13 13:16:39 +01:00
BaseActivity.java Code cleanups (#3264) 2023-02-20 19:58:37 +01:00
BottomSheetActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
EditProfileActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
LicenseActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
ListsActivity.kt 3430: Make list refresh/retry consistent (#3474) 2023-03-30 19:29:42 +02:00
MainActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
SplashActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
StatusListActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
TabData.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
TabPreferenceActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
TuskyApplication.kt 3204: Add an account based preference store (#3205) 2023-02-27 14:07:28 +01:00
ViewMediaActivity.kt update ktlint plugin to 11.3.1, format code (#3442) 2023-03-13 13:16:39 +01:00