9b5f176008
Merge remote-tracking branch 'tuskyapp/develop'
2023-12-08 02:14:28 +09:00
7dfc8790c7
update minSdk to 24, cleanup code ( #4014 )
...
closes https://github.com/tuskyapp/Tusky/issues/2607
redo of https://github.com/tuskyapp/Tusky/pull/3593
2023-09-12 19:25:45 +02:00
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
d839f18267
update ktlint plugin to 11.3.1, format code ( #3442 )
2023-03-13 13:16:39 +01:00
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
22834431ca
Convert util/{HttpHeaderLink,PairedList,TimestampUtils,ThemeUtils} to Kotlin ( #3046 )
...
* Fix off-by-one error in HttpHeaderLink
Link headers with multiple URLs with multiple parameters were being parsed
incorrectly.
Detected by adding unit tests ahead of converting to Kotlin.
* Convert util/HttpHeaderLink from Java to Kotlin
* Convert util/ThemeUtils from Java to Kotlin
* Convert util/TimestampUtils from Java to Kotlin
* Add tests for PairedList
* Convert util/PairedList from Java to Kotlin
* Implement feedback from PR
* Relicense as GPL
2022-12-31 13:01:35 +01:00
fec2e9369a
Remove unused parameter
2022-05-02 10:15:59 +09:00
95a1f5632b
Merge remote-tracking branch 'tuskyapp/develop'
2022-05-01 19:54:22 +09:00
6c630e08dd
Merge remote-tracking branch 'tuskyapp/develop'
2022-04-24 16:42:54 +09:00
e0abcbfada
Improve time format of posts when using absolute time ( #2413 )
...
* Improve time format of posts when using absolute time
* fix AbsoluteTimeFormatter, add tests
* fix tests
Co-authored-by: Conny Duck <k.pozniak@gmx.at>
2022-04-18 21:41:18 +02:00
3e849244f9
move Html parsing to ViewData ( #2414 )
...
* move Html parsing to ViewData
* refactor reports to use viewdata
* cleanup code
* refactor conversations
* fix getEditableText
* rename StatusParsingHelper
* fix tests
* commit db schema file
* add file header
* rename helper function to parseAsMastodonHtml
* order imports correctly
* move mapping off main thread to default dispatcher
* fix ktlint
2022-04-15 13:20:27 +02:00
1228f645a6
Merge remote-tracking branch 'tuskyapp/develop'
2022-04-13 00:59:06 +09:00
2fc3ba3cee
Replace “status” by “post” in strings name and source values ( #2405 )
2022-03-27 12:23:25 +02:00
ba005c769b
Merge remote-tracking branch 'tuskyapp/develop'
2022-03-04 17:51:25 +09:00
addce87eb6
Use tags from status when adding handlers to hashtag spans in status content ( #2344 )
...
* Migrate LinkHelper to kotlin
* Support tags field on statuses
* Use embedded tags list in status instead of text scraping to embed tag click handler.
Fixes #2283
* Make mentions and tags lists nonnullable
* Make LinkHelper.openLink a Context extension method
* Use builtin extension for uri conversion
* More cleanup in LinkHelper
* Add tests for LinkHelper.getDomain
* Unbreak tags in places that don't have a tag list (e.g. profiles)
* Fixup javadoc
2022-02-25 18:56:21 +01: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
554820de5f
migrate reporting to paging 3 ( #2205 )
...
* migrate reporting to paging 3
* apply PR feedback
2021-06-20 10:58:19 +02:00
44a5b42cac
Timeline refactor ( #2175 )
...
* Move Timeline files into their own package
* Introduce TimelineViewModel, add coroutines
* Simplify StatusViewData
* Handle timeilne fetch errors
* Rework filters, fix ViewThreadFragment
* Fix NotificationsFragment
* Simplify Notifications and Thread, handle pin
* Redo loading in TimelineViewModel
* Improve error handling in TimelineViewModel
* Rewrite actions in TimelineViewModel
* Apply feedback after timeline factoring review
* Handle initial failure in timeline correctly
2021-06-11 20:15:40 +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
f293670c14
migrating to ViewBinding part 6: the final cleanup ( #2117 )
2021-03-21 12:42:28 +01:00
a746009f74
Merge remote-tracking branch 'tuskyapp/develop'
2021-03-04 15:08:48 +09:00
9580870445
Animated emoji support ( #2064 )
...
* Animated emoji support
* Try to query preference only once
* Revert to using SpannableStringBuilder
2021-02-06 08:14:51 +01:00
d5f5c0b695
Use Jsoup to hide quote link
2021-01-10 13:40:02 +09:00
171f69a35d
Merge remote-tracking branch 'tuskyapp/develop'
2020-11-20 13:21:21 +09:00
6d27d822ca
update Kotlin to 1.4.10 and fix some warnigs ( #1963 )
2020-10-25 18:36:00 +01:00
0e8aa1f48b
Merge remote-tracking branch 'tuskyapp/develop'
2020-05-16 18:01:15 +09:00
2fc7ad13bb
CustomEmojiHelper: rewrite to Kotlin ( #1787 )
...
* CustomEmojiHelper: rewrite to Kotlin
* CustomEmojiHelper: PR fixes
2020-05-15 22:09:12 +02:00
cc31f7af70
Merge remote-tracking branch 'tuskyapp/develop'
2020-01-17 14:14:15 +09:00
f12f126df5
migrate ReportPagerAdapter to ViewPager2 ( #1635 )
2020-01-13 21:15:22 +01:00
b2739828dc
Merge remote-tracking branch 'tuskyapp/develop'
2020-01-11 22:46:31 +09:00
e5b78f65cf
use material buttons in timeline ( #1627 )
...
* use material buttons in timeline
* remove wrong switch option
2020-01-07 19:40:52 +01:00
9efc4a4bc9
Merge remote-tracking branch 'tuskyapp/develop'
2020-01-05 01:02:28 +09:00
352ff3a2d1
give media previews a rounded outline ( #1617 )
...
* give media previews a rounded outline
* give media previews a rounded outline in ReportActivity
2020-01-03 20:22:16 +01:00
7623962a0d
Use blurhash as image preview and as sensitive media cover, close #1571 ( #1581 )
...
* Use blurhash as image preview and as sensitive media cover, close #1571
* Fix focal point for blurhashes
* Fix video indicator overlapping sensitive media indicator
* Add a preference for blurhash
* Add blurhash to report UI.
* Introduce StatusDisplayOptions
2019-12-30 21:37:20 +01:00
820a38b070
Merge remote-tracking branch 'tuskyapp/master'
2019-09-25 20:20:37 +09:00
54a0d5406a
Remove search v1 ( #1484 )
...
* remove search v1, convert MastodonApi to Kotlin
* format MastodonApi nicely
* use default params in ConversationRepository
* improve code for LoginActivity
2019-09-22 08:18:44 +02:00
573be935a7
[quote] Implement quote feature
2019-09-03 23:08:13 +09:00
d13a341a35
enable reporting users without statuses ( #1445 )
2019-08-17 09:08:58 +02:00
588775ff9b
cleanup code in StatusViewHolders ( #1418 )
...
* cleanup code in status ViewHolder
* add check for reblogButton back in
2019-07-27 21:53:28 +02:00
f975522e63
fix shouldTrimStatus and add tests ( #1404 )
2019-07-25 12:15:54 +02:00
b95ff10a3c
Unlimited number of poll options ( #1340 )
...
* implement unlimited number of poll options
* fixes
* extract percent calculation into function so it can be used anywhere
* add license header
2019-06-22 21:55:03 +02:00
c335651b6b
Redesign report activity ( #1295 )
...
* Report activity core
* Implement navigation
* Implement navigation
* Update strings
* Revert manifest formatting
* Implement Done page
* Add landscape layout
* Implement Note fragment
* Create component
* Implement simple status adapter
* Format code
* Add date/time to report statuses
* Refactor status view holder
* Refactor code
* Refactor ViewPager
* Replace MaterialButton with Button
* Remove unneeded string
* Update Text and Check views style
* Remove old ReportActivity and rename Report2Activity to ReportActivity
* Hide "report to remote instance" checkbox for local accounts
* Add account, hashtag and links click handler
* Add media preview
* Add sensitive content support
* Add status expand/collapse support
* Update adapter to user adapterPosition instead of stored status
* Updated checked change handling
* Add polls support to report screen
* Add copyright
* Set buttonTint at CheckBox
* Exclude reblogs from statuses for reports
* Change final page check mark size
* Update report note screen
* Fix typos
* Remove unused params from api endpoint
* Replace .visibility with show()/hide()
* Replace Date().time with System.currentTime...
* Add line spacing
* Fix close button tint issue
* Updated status adapter
2019-06-09 16:55:34 +02:00
kyori19
Konrad Pozniak
Nik Clayton
Mélanie Chauvel
Levi Bard
Ivan Kupalov
Alibek Omarov
kyori19
pandasoft0