Commit graph

11 commits

Author SHA1 Message Date
a66f7bb515 Merge tag 'v28.0' into develop
# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
#	app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt
#	app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/filters/FiltersActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/trending/TrendingTagsFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/view/GraphView.kt
#	app/src/main/res/color/compound_button_color.xml
#	app/src/main/res/color/text_input_layout_box_stroke_color.xml
#	app/src/main/res/drawable/ic_check_circle.xml
#	app/src/main/res/drawable/ic_flag_24dp.xml
#	app/src/main/res/drawable/ic_person_add_24dp.xml
#	app/src/main/res/drawable/ic_play_indicator.xml
#	app/src/main/res/drawable/ic_poll_24dp.xml
#	app/src/main/res/drawable/ic_reblog_active_24dp.xml
#	app/src/main/res/drawable/ic_reblog_private_active_24dp.xml
#	app/src/main/res/drawable/report_success_background.xml
#	app/src/main/res/layout-land/item_trending_cell.xml
#	app/src/main/res/layout/activity_account.xml
#	app/src/main/res/layout/activity_edit_filter.xml
#	app/src/main/res/layout/card_license.xml
#	app/src/main/res/layout/item_announcement.xml
#	app/src/main/res/layout/item_status.xml
#	app/src/main/res/layout/item_status_detailed.xml
#	app/src/main/res/layout/item_tab_preference.xml
#	app/src/main/res/layout/item_trending_cell.xml
#	app/src/main/res/values-cs/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-fr/strings.xml
#	app/src/main/res/values-kab/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/colors.xml
#	app/src/main/res/values/strings.xml
#	app/src/main/res/values/styles.xml
#	app/src/main/res/values/theme_colors.xml
2026-01-03 09:57:39 +11:00
875013e47f Merge tag 'v25.2' into develop
# Conflicts:
#	README.md
#	app/build.gradle
#	app/lint-baseline.xml
#	app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt
#	app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.kt
#	app/src/main/res/layout/activity_about.xml
#	app/src/main/res/layout/item_emoji_pref.xml
#	app/src/main/res/values-ar/strings.xml
#	app/src/main/res/values-bg/strings.xml
#	app/src/main/res/values-cy/strings.xml
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-fa/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-is/strings.xml
#	app/src/main/res/values-it/strings.xml
#	app/src/main/res/values-ja/strings.xml
#	app/src/main/res/values-nl/strings.xml
#	app/src/main/res/values-oc/strings.xml
#	app/src/main/res/values-pt-rBR/strings.xml
#	app/src/main/res/values-pt-rPT/strings.xml
#	app/src/main/res/values-ru/strings.xml
#	app/src/main/res/values-si/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/strings.xml
#	fastlane/metadata/android/ru/full_description.txt
#	fastlane/metadata/android/zh-Hans/full_description.txt
2026-01-02 18:27:41 +11:00
cbd1268339 v23.0
-----BEGIN PGP SIGNATURE-----
 Version: BCPG v1.72
 
 iQJDBAABCAAtBQJkrEbnFiEEj23e8Mh/GILvvT0B+VJoFZwuyJcPHG5pa0BuZ28u
 b3JnLnVrAAoJEPlSaBWcLsiX5oEQANeQ26a9Hman++Ox+gXMP9+l4f1YzRq7FTmJ
 YhX5SJOfz1KN1Fbmv5ZgyI4nFUCJUASqBYube2LVV6m0mG1B4FeDAXyidUtQjH80
 Fv2H7E3BlJ1Y/Zo660/eBoTAIYothu2ukWBl8MmDeb/LpUhZ7NPPd7r8C0wD+HIJ
 1cnwDE9e7GunqsIvlg3hSzaqgSL3+EwyR2/iWMgI1X/qSDszIbk6QKq6nGP7+oLP
 +It3bQTGljgIJD+U0WpgqV+rKxV5/47RO0K+CPz7I2KpXK9GKSQ123hKxKuyndCY
 LajC9qel05aL7ufvzL8+BO2ucQJESuM1LEWB1YBgD6kTCuTrDlQHTsDCc3uOLjkO
 smlXc/tPsTAl0w/NXTrD/G6poW9yoirk4rpAAG3r8uFxzFNce5qNRGuD3TEbsBVQ
 QVmFnbxfrRZzGqcPDfH3yBn1VI7PEquM7NUp2d1PHCv/VKB4st7b7Z2oZRtr4Tv4
 vAIwsBqoGu71wGtdsx+8swPNxP/m8F7ROzvcf58M38tiYSzx+5fhJ6ffgpQ5leSu
 R7JiLws5q3FLS74mO3gs9R9xitEjTCG2+BDMLtyc30hEveELG6rorUAGtg1RAhge
 kuaLE3pz8Sxw4UbRIEnFEjLlt4EDlL4Ttwgnaxy/VTUvLJ6o7h9yawZXi3yunwgZ
 SB6u20dK
 =RrjC
 -----END PGP SIGNATURE-----

Merge Tusky 23, prep for graphics refresh
2023-08-06 16:25:50 +10:00
Nik Clayton
121db1713d
Fix lint issues in AppDatabase.java (#3809) 2023-07-06 19:37:51 +02:00
Nik Clayton
1f7a5f626d
Show notifications from workers (#3760)
Fix a crash where workers, in some conditions, should show a notification. These are sent to a dedicated channel with no importance.

Convert NotificationWorker to a CoroutineWorker and remove its use of `runBlocking`.

Fixes #3754
2023-06-29 18:37:27 +02:00
Konrad Pozniak
85b7caa887
Replace deprecated getParcelable* methods with compat versions (#3633) 2023-06-11 12:58:55 +02:00
Konrad Pozniak
f23c0cc634
Refactor "trending hashtags" code (#3595)
- Fix codeformatting
- Add new refreshing state
- Disable LogConditional lint rule
- Update lint-baseline
2023-06-10 19:47:07 +02:00
Nik Clayton
c154aaa17d
Ignore LogConditional issues (#3615)
Logs are stripped in release builds, this is an unnecessary lint
2023-05-04 14:50:21 +02:00
Nik Clayton
168be9223d
Disable lint checks for unused resource IDs (#3557)
* Disable lint checks for unused resource IDs

The check doesn't catch some instances where resources are used through viewbinding, and has too many false positives to be useful.

* Regenerate lint baseline

Delete the existing file, then regenerated with `.\gradlew lintBlueDebug -Dlint.baselines.continue=true`
2023-04-24 09:20:03 +02:00
Konrad Pozniak
3d71b6e69a
add lint to ci checks (#3462)
* add lint to ci checks

* update lint baseline
2023-03-21 18:56:11 +01:00
Nik Clayton
3ff8f73246
Enforce lint cleanliness when building (#3363)
* Enforce lint cleanliness when building

The volume of lintable issues is growing. To stem the tide:

1. Add `app/lint-baseline.xml`, which contains the current set of lint issues.
   Any issue appearing here will not cause the build to fail.

2. Move lint configuration settings in to `lint.xml`.

3. Update the lint configuration so that any issue (i.e., any issue not
   in lint-baseline.xml) causes a build failure.

4. Add the lint tasks as depedency when assembling an APK, to ensure the
   lint checks are run.

* lint: Convert launcher images to webp

* Move lint.xml location

* Don't lint when assembling

* Update baseline
2023-03-13 10:23:42 +01:00