Merge remote-tracking branch 'origin/repeat-episode/AntennaPod#778' i…

…nto repeat-episode/AntennaPod#778

# Conflicts:
#	app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java

.circleci/config.yml

@@ -106,5 +106,5 @@ workflows:
                   branchBaseCommit=`git merge-base origin/develop HEAD`
                   echo "Comparing to $branchBaseCommit"
                   curl -s -L https://github.com/ByteHamster/android-xml-formatter/releases/download/1.1.0/android-xml-formatter.jar > android-xml-formatter.jar
-                  git diff --name-only $branchBaseCommit | { grep "res/layout/" || true; } | xargs java -jar android-xml-formatter.jar
+                  git diff --name-only $branchBaseCommit --diff-filter=AM | { grep "res/layout/" || true; } | xargs java -jar android-xml-formatter.jar
                   test $(git diff | wc -l) -eq 0 || (echo -e "\n\n===== Found XML code style violations! See output below how to fix them. =====\n\n" && git --no-pager diff --color=always && false)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve existing features
-labels: 'possible bug'
+labels: 'Type: Possible bug'
 ---
 
 # Checklist

.github/workflows/android-emulator.yml

@@ -9,19 +9,22 @@ jobs:
     runs-on: macOS-latest
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '8'
+    - name: Wrapper validation
+      uses: gradle/wrapper-validation-action@v1
     - name: Build with Gradle
       run: ./gradlew assemblePlayDebugAndroidTest
     - name: Android Emulator test
       uses: ReactiveCircus/android-emulator-runner@v2
       with:
-        api-level: 28
+        api-level: 27
         disable-animations: true
         script: zsh .github/workflows/runTests.sh
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v2
       if: failure()
       with:
         name: test-report

.tx/config

@@ -5,6 +5,7 @@ host = https://www.transifex.com
 source_file = core/src/main/res/values/strings.xml
 source_lang = en
 trans.ar = core/src/main/res/values-ar/strings.xml
+trans.ast_ES = core/src/main/res/values-ast/strings.xml
 trans.br = core/src/main/res/values-br/strings.xml
 trans.ca = core/src/main/res/values-ca/strings.xml
 trans.cs_CZ = core/src/main/res/values-cs/strings.xml

CONTRIBUTING.md

@@ -18,6 +18,7 @@ How to submit a feature request
 - To make it easier for us to keep track of requests, please only make one feature request per issue.
 - Give a brief explanation about the problem that may currently exist and how your requested feature solves this problem.
 - Try to be as specific as possible. Please not only explain what the feature does, but also how. If your request is about (or includes) changing or extending the UI, describe what the UI would look like and how the user would interact with it.
+- Please use the following **[template](.github/ISSUE_TEMPLATE/feature_request.md)**. 
 
 
 Translating AntennaPod

app/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id('com.android.application')
     id('com.getkeepsafe.dexcount')
-    id('com.github.triplet.play') version '2.7.5' apply false
+    id('com.github.triplet.play') version '3.6.0-agp4.2' apply false
 }
 apply from: "../common.gradle"
 apply from: "../playFlavor.gradle"
@@ -11,8 +11,8 @@ android {
         // Version code schema:
         // "1.2.3-beta4"    -> 1020304
         // "1.2.3"          -> 1020395
-        versionCode 2020195
-        versionName "2.2.1"
+        versionCode 2040001
+        versionName "2.4.0-beta1"
 
         def commit = ""
         try {
@@ -76,9 +76,9 @@ android {
 
             dexcount {
                 if (project.hasProperty("enableDexcountInDebug")) {
-                    runOnEachPackage enableDexcountInDebug.toBoolean()
+                    runOnEachPackage = enableDexcountInDebug.toBoolean()
                 } else { // default to not running dexcount
-                    runOnEachPackage false
+                    runOnEachPackage = false
                 }
             }
         }
@@ -114,12 +114,14 @@ dependencies {
     implementation project(':model')
     implementation project(':net:sync:gpoddernet')
     implementation project(':net:sync:model')
+    implementation project(':parser:feed')
     implementation project(':ui:app-start-intent')
     implementation project(':ui:common')
 
     annotationProcessor "androidx.annotation:annotation:$annotationVersion"
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation "androidx.core:core:$coreVersion"
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation "androidx.media:media:$mediaVersion"
     implementation "androidx.preference:preference:$preferenceVersion"
@@ -149,6 +151,8 @@ dependencies {
     implementation 'com.github.mfietz:fyydlin:v0.5.0'
     implementation 'com.github.ByteHamster:SearchPreference:v2.0.0'
     implementation 'com.github.skydoves:balloon:1.1.5'
+    implementation 'com.github.xabaras:RecyclerViewSwipeDecorator:1.3'
+    implementation 'com.annimon:stream:1.2.2'
 
     // Non-free dependencies:
     playImplementation 'com.google.android.play:core:1.8.0'
@@ -168,8 +172,8 @@ dependencies {
 if (project.hasProperty("antennaPodPlayPublisherCredentials")) {
     apply plugin: 'com.github.triplet.play'
     play {
-        track = 'alpha'
-        serviceAccountCredentials = file(antennaPodPlayPublisherCredentials)
+        track.set('alpha')
+        serviceAccountCredentials.set(file(antennaPodPlayPublisherCredentials))
     }
 }
 

app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java

@@ -20,7 +20,7 @@
 /**
  * Test class for GpodnetService
  */
-@Ignore
+@Ignore("Needs valid credentials to run")
 @RunWith(AndroidJUnit4.class)
 public class GPodnetServiceTest {
 
@@ -74,20 +74,6 @@ public void testGetSubscriptionChanges() throws GpodnetServiceException {
         service.getSubscriptionChanges(1362322610L);
     }
 
-    @Test
-    public void testGetSubscriptionsOfUser()
-            throws GpodnetServiceException {
-        authenticate();
-        service.getSubscriptionsOfUser();
-    }
-
-    @Test
-    public void testGetSubscriptionsOfDevice()
-            throws GpodnetServiceException {
-        authenticate();
-        service.getSubscriptionsOfDevice(DEVICE_ID);
-    }
-
     @Test
     public void testConfigureDevices() throws GpodnetServiceException {
         authenticate();
@@ -100,12 +86,6 @@ public void testGetDevices() throws GpodnetServiceException {
         service.getDevices();
     }
 
-    @Test
-    public void testGetSuggestions() throws GpodnetServiceException {
-        authenticate();
-        service.getSuggestions(10);
-    }
-
     @Test
     public void testTags() throws GpodnetServiceException {
         service.getTopTags(20);

app/src/androidTest/java/de/test/antennapod/ui/QueueFragmentTest.java

@@ -15,7 +15,6 @@
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
-import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static de.test.antennapod.NthMatcher.first;
 import static org.hamcrest.CoreMatchers.allOf;
@@ -40,9 +39,11 @@ public void setUp() {
 
     @Test
     public void testLockEmptyQueue() {
-        onView(withContentDescription(R.string.lock_queue)).perform(click());
+        onView(first(EspressoTestUtils.actionBarOverflow())).perform(click());
+        onView(withText(R.string.lock_queue)).perform(click());
         onView(allOf(withClassName(endsWith("Button")), withText(R.string.lock_queue))).perform(click());
-        onView(withContentDescription(R.string.unlock_queue)).perform(click());
+        onView(first(EspressoTestUtils.actionBarOverflow())).perform(click());
+        onView(withText(R.string.lock_queue)).perform(click());
     }
 
     @Test

app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/Rss2Generator.java

@@ -11,8 +11,8 @@
 import de.danoeh.antennapod.model.feed.Feed;
 import de.danoeh.antennapod.model.feed.FeedFunding;
 import de.danoeh.antennapod.model.feed.FeedItem;
-import de.danoeh.antennapod.core.syndication.namespace.PodcastIndex;
-import de.danoeh.antennapod.core.util.DateUtils;
+import de.danoeh.antennapod.parser.feed.namespace.PodcastIndex;
+import de.danoeh.antennapod.core.util.DateFormatter;
 
 /**
  * Creates RSS 2.0 feeds. See FeedGenerator for more information.
@@ -98,7 +98,7 @@ public void writeFeed(Feed feed, OutputStream outputStream, String encoding, lon
                 }
                 if (item.getPubDate() != null) {
                     xml.startTag(null, "pubDate");
-                    xml.text(DateUtils.formatRFC822Date(item.getPubDate()));
+                    xml.text(DateFormatter.formatRfc822Date(item.getPubDate()));
                     xml.endTag(null, "pubDate");
                 }
                 if ((flags & FEATURE_WRITE_GUID) != 0) {