Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity
Yuito-app-android/app/src/main/java/com/keylesspalace/tusky
History
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
..
adapter Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
appstore Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
components Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
db Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
di Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
entity Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
fragment Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
interfaces Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
json don't crash on unparseable date (#3129) 2023-01-09 21:24:04 +01:00
network Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
pager move AccountActivity and related classes to a new package (#2216) 2022-01-11 19:55:17 +01:00
receiver Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
service Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
settings Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
usecase Keep scroll position when loading missing statuses (#3000) 2023-01-13 19:26:24 +01:00
util Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
view Convert BezelImageView, EndlessOnScrollListener, ComposeScheduleView, ProgressImageView to Kotlin (#3147) 2023-01-13 19:49:56 +01:00
viewdata Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
viewmodel Merge remote-tracking branch 'tuskyapp/develop' 2022-11-12 04:35:49 +09:00
AboutActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2021-07-03 23:59:57 +09:00
AccountListActivity.kt revert CompatExtensions (#2773) 2022-11-09 19:32:54 +01:00
AccountsInListFragment.kt migrate Lists from RxJava to Kotlin coroutines (#2537) 2022-05-18 18:45:35 +02:00
BaseActivity.java Convert util/{HttpHeaderLink,PairedList,TimestampUtils,ThemeUtils} to Kotlin (#3046) 2022-12-31 13:01:35 +01:00
BottomSheetActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2022-12-29 22:53:20 +09:00
EditProfileActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2022-11-12 04:35:49 +09:00
FiltersActivity.kt Implement getFilters() without rxjava (#2990) 2022-12-07 19:30:53 +01:00
LicenseActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2022-11-12 04:35:49 +09:00
ListsActivity.kt Convert util/{HttpHeaderLink,PairedList,TimestampUtils,ThemeUtils} to Kotlin (#3046) 2022-12-31 13:01:35 +01:00
MainActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +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-01-29 04:44:17 +09:00
TabData.kt Merge remote-tracking branch 'tuskyapp/develop' 2022-12-29 22:53:20 +09:00
TabPreferenceActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2022-11-12 04:35:49 +09:00
TuskyApplication.kt Convert util/{HttpHeaderLink,PairedList,TimestampUtils,ThemeUtils} to Kotlin (#3046) 2022-12-31 13:01:35 +01:00
ViewMediaActivity.kt Support a swipe down to dismiss video (#2879) 2022-12-05 14:33:38 +01:00