Merge branch 'main' into merge/release-7.25-rc-1-into-main

# Conflicts:
#	version.properties

CHANGELOG.md

@@ -1,6 +1,13 @@
 7.26
 -----
 
+* New Features:
+ * Added a Halloween icon.
+ ([#415](https://github.com/Automattic/pocket-casts-android/pull/415)).
+ * Fixed skip backwards settings
+ ([#425](https://github.com/Automattic/pocket-casts-android/pull/425)).
+ * Fixed background color for screens using the compose theme
+ ([#432](https://github.com/Automattic/pocket-casts-android/pull/432)).
 
 7.25
 -----

app/build.gradle

@@ -93,6 +93,7 @@ dependencies {
  implementation project(':modules:features:filters')
  implementation project(':modules:features:navigation')
  implementation project(':modules:features:account')
+ implementation project(':modules:features:endofyear')
 }
 
 task appStart(type: Exec, dependsOn: 'installDebug') {

app/src/main/AndroidManifest.xml

@@ -421,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"
@@ -485,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"

app/src/main/java/au/com/shiftyjelly/pocketcasts/ui/MainActivity.kt

@@ -12,6 +12,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.widget.Toolbar
+import androidx.compose.ui.res.stringResource
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
@@ -26,8 +27,13 @@ import au.com.shiftyjelly.pocketcasts.account.PromoCodeUpgradedFragment
 import au.com.shiftyjelly.pocketcasts.analytics.AnalyticsEvent
 import au.com.shiftyjelly.pocketcasts.analytics.AnalyticsTrackerWrapper
 import au.com.shiftyjelly.pocketcasts.analytics.FirebaseAnalyticsTracker
+import au.com.shiftyjelly.pocketcasts.compose.AppTheme
+import au.com.shiftyjelly.pocketcasts.compose.bottomsheet.BottomSheetContentState
+import au.com.shiftyjelly.pocketcasts.compose.bottomsheet.BottomSheetContentState.Content.Button
+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
@@ -249,6 +255,10 @@ class MainActivity :
  handleIntent(intent, savedInstanceState)
 
  updateSystemColors()
+
+ if (BuildConfig.END_OF_YEAR_ENABLED) {
+ setupEndOfYearLaunchBottomSheet()
+ }
  }
 
  override fun onStart() {
@@ -446,6 +456,30 @@ class MainActivity :
  showBottomSheet(UpNextFragment.newInstance(source = source))
  }
 
+ private fun setupEndOfYearLaunchBottomSheet() {
+ binding.modalBottomSheet.setContent {
+ AppTheme(themeType = theme.activeTheme) {
+ ModalBottomSheet(
+ showOnLoad = true,
+ content = BottomSheetContentState.Content(
+ titleText = stringResource(LR.string.end_of_year_launch_modal_title),
+ 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 = {
+ StoriesFragment.newInstance()
+ .show(supportFragmentManager, "stories_dialog")
+ }
+ ),
+ secondaryButton = Button.Secondary(
+ label = stringResource(LR.string.end_of_year_launch_modal_secondary_button_title),
+ ),
+ )
+ )
+ }
+ }
+ }
+
  @OptIn(DelicateCoroutinesApi::class)
  @Suppress("DEPRECATION")
  private fun setupPlayerViews() {

app/src/main/res/layout/activity_main.xml

@@ -62,6 +62,12 @@
  android:clickable="true"
  android:translationZ="200dp"/>
 
+ <androidx.compose.ui.platform.ComposeView
+ android:id="@+id/modalBottomSheet"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:translationZ="200dp"/>
+
  </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
  <au.com.shiftyjelly.pocketcasts.views.component.RadioactiveLineView

base.gradle

@@ -27,6 +27,9 @@ android {
  buildConfigField "String", "SETTINGS_ENCRYPT_SECRET", "\"${project.settingsEncryptSecret}\""
  buildConfigField "String", "SHARING_SERVER_SECRET", "\"${project.sharingServerSecret}\""
 
+ // Feature Flags
+ buildConfigField "boolean", "END_OF_YEAR_ENABLED", "false"
+
  testInstrumentationRunner project.testInstrumentationRunner
  testApplicationId "au.com.shiftyjelly.pocketcasts.test" + project.name.replace("-", "_")
  vectorDrawables.useSupportLibrary = true

fastlane/env/user.env-example

@@ -1,3 +1,7 @@
+# Requires: 'repo'
 GITHUB_TOKEN=<GitHub access token>
 
+# Requires:
+# Organizations: 'Automattic',
+# REST Scopes: 'write_builds'
 BUILDKITE_TOKEN=<Buildkite Personal Access Token>

gradle.properties

@@ -14,6 +14,13 @@
 android.nonTransitiveRClass=true
 android.useAndroidX=true
 
+# Disable unused Android Gradle Plugin features
+android.defaults.buildfeatures.aidl=false
+android.defaults.buildfeatures.renderscript=false
+android.defaults.buildfeatures.resvalues=false
+android.defaults.buildfeatures.shaders=false
+
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xmx8048M
 org.gradle.parallel=true
+org.gradle.caching=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionSha256Sum=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219