From 348367e084988aacbe91cc90c206eb6b4ea07873 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 7 Oct 2023 01:04:01 -0500 Subject: [PATCH 1/2] Replace INSTALL_SHORTCUT with requestPinShortcut --- .../tasks/widget/ShortcutConfigActivity.kt | 24 ++++++++++--------- gradle/libs.versions.toml | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt index f97d0e7ea..daceadbd9 100644 --- a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt +++ b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt @@ -1,15 +1,15 @@ package org.tasks.widget -import android.app.Activity -import android.content.Intent -import android.content.Intent.ShortcutIconResource import android.os.Bundle -import android.os.Parcelable import android.view.View import android.widget.TextView import androidx.appcompat.widget.Toolbar +import androidx.core.content.pm.ShortcutInfoCompat +import androidx.core.content.pm.ShortcutManagerCompat +import androidx.core.graphics.drawable.IconCompat import com.google.android.material.textfield.TextInputEditText import com.todoroo.astrid.api.Filter +import com.todoroo.astrid.helper.UUIDHelper import dagger.hilt.android.AndroidEntryPoint import org.tasks.R import org.tasks.Strings.isNullOrEmpty @@ -124,13 +124,15 @@ class ShortcutConfigActivity : ThemedInjectingAppCompatActivity(), ColorPaletteP private fun save() { val filterId = defaultFilterProvider.getFilterPreferenceValue(selectedFilter!!) - val shortcutIntent = TaskIntents.getTaskListByIdIntent(this, filterId) - val icon: Parcelable = ShortcutIconResource.fromContext(this, ThemeColor.ICONS[themeIndex]) - val intent = Intent("com.android.launcher.action.INSTALL_SHORTCUT") - intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent) - intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getShortcutName()) - intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon) - setResult(Activity.RESULT_OK, intent) + ShortcutManagerCompat.requestPinShortcut( + this, + ShortcutInfoCompat.Builder(this, UUIDHelper.newUUID()) + .setShortLabel(getShortcutName()) + .setIntent(TaskIntents.getTaskListByIdIntent(this, filterId)) + .setIcon(IconCompat.createWithResource(this, ThemeColor.ICONS[themeIndex])) + .build(), + null, + ) finish() } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a0eb05446..ae6108f58 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ google-oauth2 = "1.19.0" google-api-drive = "v3-rev20230822-2.0.0" google-api-tasks = "v1-rev20230401-2.0.0" google-services = "4.4.0" -gradle = "8.2.0-beta05" +gradle = "8.2.0-beta06" gson = "2.10.1" hilt = "1.1.0-alpha01" ical4android = "12fe73a" From abc099c309f6feb1dafa9ccbd847021a36f440c6 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 7 Oct 2023 01:26:29 -0500 Subject: [PATCH 2/2] Update version and changelog --- CHANGELOG.md | 12 +++++++++--- app/build.gradle.kts | 2 +- .../en-US/changelogs/{130600.txt => 130601.txt} | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-) rename fastlane/metadata/android/en-US/changelogs/{130600.txt => 130601.txt} (87%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 229ef09f1..fc4170ee5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ -### 13.6 (2023-09-17) +### 13.6 (2023-10-07) * Change priority with multi-select [#2257](https://github.com/tasks/tasks/pull/2452) - @vulewuxe86 * Automatically select newly copied tasks [#2246](https://github.com/tasks/tasks/pull/2446) - @vulewuxe86 * Reduce minimum size for widgets [#2436](https://github.com/tasks/tasks/pull/2436) - @histefanhere +* Replace deprecated method call [#2526](https://github.com/tasks/tasks/pull/2526) - @kmj-99 * Improve handling text shared to Tasks [#2485](https://github.com/tasks/tasks/issues/2485) * Use notification audio stream for completion sound * Notification preference 'More settings' opens channel settings directly @@ -15,11 +16,16 @@ * Catalan - Joan Montané * Chinese (Simplified) - Poesty Li * Chinese (Traditional) - @abc0922001 - * German - @qwerty287, deep map + * Dutch - @fvbommel + * French - @FlorianLeChat + * German - @qwerty287, deep map, @franconian + * Hungarian - Kaci * Italian - @ppasserini * Japanese - Kazushi Hayama, Naga + * Spanish - @FlorianLeChat * Swedish - @Anaemix, @bittin - * Turkish - @emintufan + * Turkish - @emintufan, @oersen + * Ukrainian - @IhorHordiichuk ### 13.5.1 (2023-08-02) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0bc138e33..fbe9124a7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -55,7 +55,7 @@ android { defaultConfig { testApplicationId = "org.tasks.test" applicationId = "org.tasks" - versionCode = 130600 + versionCode = 130601 versionName = "13.6" targetSdk = 33 minSdk = 24 diff --git a/fastlane/metadata/android/en-US/changelogs/130600.txt b/fastlane/metadata/android/en-US/changelogs/130601.txt similarity index 87% rename from fastlane/metadata/android/en-US/changelogs/130600.txt rename to fastlane/metadata/android/en-US/changelogs/130601.txt index 8a94533eb..d985272a4 100644 --- a/fastlane/metadata/android/en-US/changelogs/130600.txt +++ b/fastlane/metadata/android/en-US/changelogs/130601.txt @@ -1,9 +1,11 @@ * Change priority with multi-select - @vulewuxe86 * Automatically select newly copied tasks - @vulewuxe86 * Reduce minimum size for widgets - @histefanhere +* Replace deprecated method call - @kmj-99 * Improve handling text shared to Tasks * Use notification audio stream for completion sound * Notification preference 'More settings' opens channel settings directly * Respect 'New tasks on top' preference when creating subtasks * Automatically add due dates for recurring tasks +* Fix crash on startup * Update translations