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 57aab71b0e
Merge remote-tracking branch 'tuskyapp/develop' 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/keylesspalace/tusky/SplashActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
#	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/conversation/ConversationViewHolder.java
#	app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
#	app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineTypeMappers.kt
#	app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt
#	app/src/main/res/layout/activity_main.xml
#	app/src/main/res/values-cs/strings.xml
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-fa/strings.xml
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-hu/strings.xml
#	app/src/main/res/values-it/strings.xml
#	app/src/main/res/values-no-rNB/strings.xml
#	app/src/main/res/values-zh-rCN/strings.xml
 		2022-07-16 02:51:51 +09:00
..
adapter Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
appstore Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
components Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
db Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
di Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
entity Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
fragment Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
interfaces fix SearchActivity transition animations (#2464) 2022-04-28 20:37:46 +02:00
json use moshis Rfc3339DateJsonAdapter for json date parsing (#2584) 2022-06-16 18:51:35 +02:00
network Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +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' 2022-05-19 02:42:27 +09:00
service Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
settings Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
usecase improve logout (#2579) 2022-06-20 16:45:54 +02:00
util Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
view Use tags from status when adding handlers to hashtag spans in status content (#2344) 2022-02-25 18:56:21 +01:00
viewdata Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
viewmodel Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
AboutActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2021-07-03 23:59:57 +09:00
AccountListActivity.kt add ktlint plugin to project and apply default code style (#2209) 2021-06-28 21:13:24 +02:00
AccountsInListFragment.kt migrate Lists from RxJava to Kotlin coroutines (#2537) 2022-05-18 18:45:35 +02:00
BaseActivity.java Implement Login via WebView (#2371) 2022-03-08 21:22:19 +01:00
BottomSheetActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2022-03-04 17:51:25 +09:00
EditProfileActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2022-03-04 17:51:25 +09:00
FiltersActivity.kt add ktlint plugin to project and apply default code style (#2209) 2021-06-28 21:13:24 +02:00
LicenseActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2021-07-03 23:59:57 +09:00
ListsActivity.kt migrate Lists from RxJava to Kotlin coroutines (#2537) 2022-05-18 18:45:35 +02:00
MainActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +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' 2022-05-19 02:42:27 +09:00
TabData.kt Merge commit '643e012b11f20538fd17aa3ab888d8e739ebd0d0' 2022-03-04 16:29:48 +09:00
TabPreferenceActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
TuskyApplication.kt New emoji picker (#2395) 2022-04-26 18:50:58 +02:00
ViewMediaActivity.kt upgrade ktlint gradle plugin to 10.2.1 (#2435) 2022-04-16 09:45:45 +02:00
ViewThreadActivity.java Use tags from status when adding handlers to hashtag spans in status content (#2344) 2022-02-25 18:56:21 +01:00