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
e1c8461423
replace kotlin-result-calladapter with networkresult-calladapter ( #2569 )
...
* replace kotlin-result-calladapter with networkresult-calladapter
* fix tests
2022-05-30 20:03:40 +02:00
bded6a86d6
Merge remote-tracking branch 'tuskyapp/develop'
2022-05-19 21:13:56 +09:00
5abb82004a
migrate Lists from RxJava to Kotlin coroutines ( #2537 )
...
* migrate Lists from RxJava to Kotlin coroutines
* use DROP_OLDEST when creating MutableSharedFlow
2022-05-18 18:45:35 +02:00
2005b32dfa
Merge remote-tracking branch 'tuskyapp/develop'
2021-07-03 23:59:57 +09:00
16ffcca748
add ktlint plugin to project and apply default code style ( #2209 )
...
* add ktlint plugin to project and apply default code style
* some manual adjustments, fix wildcard imports
* update CONTRIBUTING.md
* fix formatting
2021-06-28 21:13:24 +02:00
40b24cd242
migrate to RxJava3 ( #2146 )
...
* migrate to RxJava3
* remove unused import
2021-05-16 19:53:27 +02:00
609dcf46cb
Merge remote-tracking branch 'tuskyapp/develop'
2021-04-28 11:54:29 +09:00
dee6a3a160
always show follow requests in main menu ( #1809 )
...
* always show follow requests in main menu
* update recyclerview to v1.2.0
* fix bug that shows follow requests info to wrong users
2021-04-10 20:30:44 +02:00
0b86f58139
convert some regular strings to plural strings ( #2100 )
...
* convert some regular strings to plural strings
* convert hint_describe_for_visually_impaired from string to plurals
* fix ukrainian strings
2021-03-07 19:43:25 +01:00
ff69a2ad0d
migrating to ViewBinding part 2: Activities ( #2093 )
2021-03-07 19:05:51 +01:00
a746009f74
Merge remote-tracking branch 'tuskyapp/develop'
2021-03-04 15:08:48 +09:00
483beaa957
move onOptionsItemSelected to BaseActivity ( #2059 )
...
* move onOptionsItemSelected to BaseActivity
* revert change in ComposeActivity
2021-01-31 20:27:02 +01:00
171f69a35d
Merge remote-tracking branch 'tuskyapp/develop'
2020-11-20 13:21:21 +09:00
53bd081802
use MaterialContainerTransform for ActionButton animation ( #1961 )
...
* use MaterialContainerTransform for ActionButton animation
* fix back button in TabPreferenceActivity
2020-10-19 14:57:55 +02:00
bb5106a18d
Merge remote-tracking branch 'tuskyapp/develop' into master
2020-09-06 12:52:19 +09:00
67225dd4c0
fix various bugs when creating tab with multiple hashtags ( #1925 )
2020-09-02 12:28:13 +02:00
0e8aa1f48b
Merge remote-tracking branch 'tuskyapp/develop'
2020-05-16 18:01:15 +09:00
df8dc3a198
enable multiple hashtags in one hashtag tab ( #1790 )
...
* enable multiple hashtags in one hashtag tab
* add comment explaining the code in TabAdapter
* delete unused drawables
* add padding to EditText in dialog
2020-05-15 22:10:29 +02:00
1370eedc10
Merge remote-tracking branch 'tuskyapp/develop'
2020-04-09 00:34:31 +09:00
c80fa68dbe
upgrade dependencies, fix some warnings ( #1747 )
...
* upgrade dependencies, fix some warnings
* fix tests
2020-04-06 11:46:38 +02:00
fbb1c5aee6
Merge remote-tracking branch 'tuskyapp/develop'
2020-02-12 12:16:30 +09:00
8767d2ed3d
Theme refactoring ( #1656 )
...
* Theme refactoring
* disable the automatic tinting of surfaces with elevation in dark mode
* make the media warning visible again with the dark theme
* fix nav bar on api 27+
* use correct color for all media warnings
2020-01-30 21:37:28 +01:00
61bc887af5
Merge remote-tracking branch 'tuskyapp/develop'
2019-12-27 14:46:18 +09:00
54b3d1f8cd
Add close icon to tabs in Tabs account preferences page ( #1588 )
...
* Add close icon to tabs in Tabs account preferences page
* Improve code according to code review
2019-12-19 18:35:55 +01:00
5a7389d1aa
Merge remote-tracking branch 'upstream/develop'
2019-12-08 00:47:56 +09:00
d6ae071a09
List tabs ( #1570 )
...
* List tabs
* Add comment
* Move decoder part to TabData.createTabDataFromId
* Fix drawable tint
* Use dedicated view for list picker
* Error log
* Fix logging
Co-Authored-By: Konrad Pozniak <connyduck@users.noreply.github.com>
* Fix tint color
Co-Authored-By: Konrad Pozniak <connyduck@users.noreply.github.com>
* Fix missing import
* Move encoding part too
* Fix comment
* Fix decoder
* Revert "Fix decoder"
This reverts commit fdc45aac9c113348f8740e6692d2d8e9ace14f7f.
* Revert "Fix comment"
This reverts commit 704b4e6d2e5545d5f2d20c9bc6bc276d6257d119.
* Revert "Move encoding part too"
This reverts commit 32e77346ff98ae1133e76ab6dfd880b26171005e.
* Revert "Move decoder part to TabData.createTabDataFromId"
This reverts commit d1cd2070ab
2019-12-02 16:53:24 +01:00
6f1e7fb74b
Merge branch 'list-tabs'
2019-11-29 23:25:38 +09:00
1f62078fbe
Error log
2019-11-29 23:21:54 +09:00
76004298a1
List tabs
2019-11-24 13:55:45 +09:00
bddd032f72
I want more tabs!
2019-11-24 11:57:43 +09:00
b21d711819
List tabs
2019-11-24 11:56:32 +09:00
546cb4bacc
upgrade autodispose ( #1490 )
...
* upgrade autodispose
* set AutoDisposePlugins.setHideProxies to false
2019-09-22 08:19:44 +02:00
29455d5ccd
prevent empty hashtag in TabPreferenceActivity ( #1160 )
2019-03-28 21:10:53 +01:00
0c48dcf06c
add hashtag tabs ( #1145 )
...
* add hashtag tabs
* address review feedback
2019-03-24 08:59:55 +01:00
08c1bbd253
fix crash in NotificationsFragment ( #1119 )
...
* fix crash in NotificationsFragment
* don't reload notifications
* add updateAdapter()
2019-03-13 09:32:59 +01:00
f4ac9b3da6
make max tabs reached message translateable
2019-02-15 21:35:14 +01:00
fc95903866
call db operation on background thread in TabPreferenceActivity ( #1036 )
2019-02-13 19:20:43 +01:00
e371fa0e24
Tab customization & direct messages tab ( #1012 )
...
* custom tabs
* custom tabs interface
* implement custom tab functionality
* add database migration
* fix bugs, improve ThemeUtils nullability handling
* implement conversationsfragment
* setup ConversationViewHolder
* implement favs
* add button functionality
* revert 10.json
* revert item_status_notification.xml
* implement more menu, replying, fix stuff, clean up
* fix tests
* fix bug with expanding statuses
* min and max number of tabs
* settings support, fix bugs
* database migration
* fix scrolling to top after refresh
* fix bugs
* fix warning in item_conversation
2019-02-12 19:22:37 +01:00
kyori19
Konrad Pozniak
kyori19
Mélanie Chauvel (ariasuni)
Conny Duck