Merge branch 'main' into taskerplugin

jacobherrington · Oct 24, 2022 · fcd33ba · fcd33ba
2 parents e96961b + f3654d6
commit fcd33ba
Show file tree

Hide file tree

Showing 30 changed files with 685 additions and 310 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,6 @@
 name: Feature suggestion
 description: Propose a feature in the Pocket Casts Android app
-labels: ["feature", "triage"]
+labels: ["feature request", "triage"]
 body:
 
  - type: markdown

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,15 @@
 -----
 
 * New Features:
- * Added a Halloween icon.
- ([#415](https://github.com/Automattic/pocket-casts-android/pull/415)).
  * Added Tasker integration with "Play Filter" and "Control Playback" actions.
  ([#415](https://github.com/Automattic/pocket-casts-android/pull/431)).
+ * Fixed background color for screens using the compose theme
+ ([#432](https://github.com/Automattic/pocket-casts-android/pull/432)).
+* Bug Fixes:
+ * Fixed Help & Feedback buttons being hidden when using text zoom.
+ ([#446](https://github.com/Automattic/pocket-casts-android/pull/446)).
+ * Fixed when system bar didn't disappear on full screen video player
+ ([#461](https://github.com/Automattic/pocket-casts-android/pull/461)).
 
 7.25
 -----
@@ -19,6 +24,19 @@
  ([#389](https://github.com/Automattic/pocket-casts-android/pull/389)).
  * Added new episode lists to Automotive OS. Starred, Listening History, and Files.
  ([#403](https://github.com/Automattic/pocket-casts-android/pull/403)).
+ * Fixed skip backwards settings
+ ([#425](https://github.com/Automattic/pocket-casts-android/pull/425)).
+
+7.24.2
+-----
+
+* New Features:
+ * Added a Halloween icon.
+ ([#415](https://github.com/Automattic/pocket-casts-android/pull/415)).
+
+* Bug Fixes:
+ * Add missing POST_NOTIFICATIONS permission for Android 13
+ ([#330](https://github.com/Automattic/pocket-casts-android/pull/436)).
 
 7.24
 -----

diff --git a/app/build.gradle b/app/build.gradle
@@ -94,6 +94,7 @@ dependencies {
  implementation project(':modules:features:navigation')
  implementation project(':modules:features:account')
  implementation project(':modules:features:taskerplugin')
+ implementation project(':modules:features:endofyear')
 }
 
 task appStart(type: Exec, dependsOn: 'installDebug') {

diff --git a/app/src/androidTest/java/au/com/shiftyjelly/pocketcasts/views/helper/ShowNotesHelperTest.kt b/app/src/androidTest/java/au/com/shiftyjelly/pocketcasts/views/helper/ShowNotesHelperTest.kt
@@ -31,5 +31,10 @@ class ShowNotesHelperTest {
  actual = ShowNotesHelper.convertTimesToLinks("<li><a href=\"https://overcast.fm/+BtuyYAAIQ/16:45\">Confirmation of John's prediction about face swipe timing</a></li>")
  expected = "<li><a href=\"https://overcast.fm/+BtuyYAAIQ/16:45\">Confirmation of John's prediction about face swipe timing</a></li>"
  assertEquals(actual, expected)
+
+ // Do not replace timeskip when it is in an URL - https://github.com/Automattic/pocket-casts-android/issues/145
+ actual = ShowNotesHelper.convertTimesToLinks("<li><a href=\"https://www.theverge.com/2021/12/21/22848957/lg-dualup-32-inch-4k-ultra-fine-monitors-announced-specs\">LG’s new 16:18 monitor looks like a multitasking powerhouse</a></li>")
+ expected = "<li><a href=\"https://www.theverge.com/2021/12/21/22848957/lg-dualup-32-inch-4k-ultra-fine-monitors-announced-specs\">LG’s new 16:18 monitor looks like a multitasking powerhouse</a></li>"
+ assertEquals(actual, expected)
  }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
  <uses-permission android:name="com.android.vending.BILLING" />
  <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
  <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+ <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
  <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
 
@@ -420,9 +421,6 @@
  <activity android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
  android:theme="@style/Theme.AppCompat.DayNight"/>
 
- <!-- services which are user triggered, eg: run in the foreground -->
- <service android:name="au.com.shiftyjelly.pocketcasts.ui.tasks.RefreshArtworkTask"/>
-
  <!-- services which are periodic or trigerred by the app automatically triggered, eg: can run in the background -->
  <service android:name="au.com.shiftyjelly.pocketcasts.repositories.download.UpdateEpisodeDetailsJob"
  android:permission="android.permission.BIND_JOB_SERVICE"
@@ -484,11 +482,6 @@
  </intent-filter>
  </receiver>
 
- <receiver
- android:name="au.com.shiftyjelly.pocketcasts.views.component.CustomTabsBroadcastReceiver"
- android:enabled="true">
- </receiver>
-
  <!-- Google play services -->
  <meta-data
  android:name="com.google.android.gms.version"

diff --git a/app/src/main/java/au/com/shiftyjelly/pocketcasts/ui/MainActivity.kt b/app/src/main/java/au/com/shiftyjelly/pocketcasts/ui/MainActivity.kt
@@ -33,6 +33,7 @@ import au.com.shiftyjelly.pocketcasts.compose.bottomsheet.BottomSheetContentStat
 import au.com.shiftyjelly.pocketcasts.compose.bottomsheet.ModalBottomSheet
 import au.com.shiftyjelly.pocketcasts.databinding.ActivityMainBinding
 import au.com.shiftyjelly.pocketcasts.discover.view.DiscoverFragment
+import au.com.shiftyjelly.pocketcasts.endofyear.StoriesFragment
 import au.com.shiftyjelly.pocketcasts.filters.FiltersFragment
 import au.com.shiftyjelly.pocketcasts.localization.helper.LocaliseHelper
 import au.com.shiftyjelly.pocketcasts.models.entity.Episode
@@ -465,7 +466,10 @@ class MainActivity :
  summaryText = stringResource(LR.string.end_of_year_launch_modal_summary),
  primaryButton = Button.Primary(
  label = stringResource(LR.string.end_of_year_launch_modal_primary_button_title),
- onClick = {}
+ onClick = {
+ StoriesFragment.newInstance()
+ .show(supportFragmentManager, "stories_dialog")
+ }
  ),
  secondaryButton = Button.Secondary(
  label = stringResource(LR.string.end_of_year_launch_modal_secondary_button_title),

diff --git a/docs/pull-request-guidelines.md b/docs/pull-request-guidelines.md
@@ -27,6 +27,6 @@ All released versions are tagged with the version number. For example, the 7.19.
 
 When you are ready, please, spend time crafting a good Pull Request, since it will have a huge impact on the work of reviewers, release managers and testers.
 
-We have a [Pull Request template](.github/pull_request_template.md) to help. 
+We have a [Pull Request template](../.github/pull_request_template.md) to help. 
 
 _Thank you very much for contributing to Pocket Casts Android!_
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar