Merge pull request #4120 from TacoTheDank/develop

Clean up some non-code files

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,30 +9,51 @@ DELETE ME
 
 Use the search function to see if someone else has already submitted the same bug report.
 
+Try to describe the problem with as much detail as possible.
+
+Some bugs may only occur on certain devices or versions of Android. Please add information about your device and the version of Android that is running on it (you can look these up under `Settings → About Phone`), as well as which version of AntennaPod you are using.
+
+If the bug only seems to occur with a certain podcast, please include the URL of that podcast.
+
+If possible, add instructions on how to reproduce the bug.
+
+If possible, add a logfile to your post. This is especially useful if the bug makes the application crash. AntennaPod has an `export logs` feature for this.
+
+Usually, you can take a screenshot of your smartphone by pressing *Power* + *Volume down* for a few seconds.
+
 You don't need to adhere to the template strictly. Feel free to leave out information you feel is not important or does not make sense.
 
 If you are experiencing a crash, including the stacktrace will likely get it fixed sooner.
 -->
 
-**App version**: 1.x (from Google Play/F-Droid/Custom build)
+<!-- READ THIS: The latest version may be different depending on your device. You can find the version in AntennaPod's settings. -->
+**App version**: x.y.z (state whether from Google Play/F-Droid/Custom built APK)
+
+
+**Android version**: 5.x (Please mention if you are using a custom rom!)
 
-**Android version**: 5.x [Please mention if you are using a custom rom!]
 
 **Device model**:
 
+
 **Expected behaviour**:
 
+
 **Current behaviour**:
 
-**First occurred**: Version 1.x / about x days/weeks ago
+
+**First occurred**: (e.g. about x days/weeks ago)
+
 
 **Steps to reproduce**:
-
 1. This
-1. Than that
+2. Then that
-1. Then
+3. Then this
+4. Etc.
+
+
+**Environment**: (Settings you have changed (e.g. Auto Download). "Unusual" devices you use (e.g. Bluetooth headphones). Did you select another media player?)
 
-**Environment**: [Settings you have changed, e.g. Auto Download. "Unusual" devices you use, e.g. Bluetooth headphones. Did you select another media player?]
 
 **Stacktrace/Logcat**: 
 ```

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,19 +7,25 @@ about: Request a new feature
 <!--
 DELETE ME
 
-Use the search function to see if someone else has already submitted the same feature request. If there already is another request, please upvote the first post instead of commenting something like "I also want this".
+Make sure you are using the latest version of AntennaPod. Perhaps the feature you are looking for has already been implemented.
+
+Use the search function to see if someone else has already submitted the same feature request. If there is another request already, please upvote the first post instead of commenting something like "I also want this".
 
 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 currently exists and why your requested feature solves this problem.
+Give a brief explanation about the problem that may currently exist and how your requested feature solves this problem.
 
-Try do be as specific as possible. Please not only explain what the feature does, but also how. When your request is about changing or extending the UI, describe what the UI would look like and how the user would interact with it.
+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.
 -->
 
-**App version**: 1.x (from Google Play/F-Droid/Custom build)
+<!-- READ THIS: The latest version may be different depending on your device. You can find the version in AntennaPod's settings. -->
+**App version**: x.y.z (state whether from Google Play/F-Droid/Custom built APK)
+
+
+**Problem you may be having, or feature you want**:
 
-**Problem you are having**:
 
 **Suggested solution**:
 
+
 **Screenshots / Drawings / Technical details**:

CHANGELOG.md

@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+Version 1.8.1
+-------------
+* Enabled picture-in-picture for video podcasts by default (by @ByteHamster)
+* Fixed podcast discovery not showing local trends (by @tonytamsf)
+* Various bug fixes and improvements (by @ByteHamster)
+
 Version 1.8.0
 -------------
 * Added per-feed playback speed setting (by @spacecowboy)

CONTRIBUTING.md

@@ -1,63 +1,40 @@
 How to report a bug
 -------------------
-- Use the search function to see if someone else has already reported the bug. If an issue has already been opened, see if you can add any useful information to it.
+- Before anything else, please make sure you are on the latest version, the bug you are experiencing may have been fixed already!
-- Otherwise, create a new issue on the "issues" page
+- Use the search function to see if someone else has already submitted the same bug report.
-- Describe the problem as detailed as possible.
+- Try to describe the problem with as much detail as possible.
-- Some bugs only occur on certain devices or versions of Android. Please add information about your device and the version of Android that is running on it (you can look these up under `Settings → About Phone`) as well as which version of AntennaPod you are using.
+- Some bugs may only occur on certain devices or versions of Android. Please add information about your device and the version of Android that is running on it (you can look these up under `Settings → About Phone`), as well as which version of AntennaPod you are using.
-- If the bug only seems to occur with a certain podcast, make sure to include the URL of that podcast.
+- If the bug only seems to occur with a certain podcast, please include the URL of that podcast.
 - If possible, add instructions on how to reproduce the bug.
-- If possible, add a logfile to your post. This is especially useful if the bug makes the application crash. You can create logfiles with an app like `aLogcat`. Just launch `alogcat`, then start AntennaPod and reproduce the bug. aLogcat should now display information about the bug when you start it.
+- If possible, add a logfile to your post. This is especially useful if the bug makes the application crash. AntennaPod has an `export logs` feature for this.
-- Usually, you can make a screenshot of your smartphone by pressing [Power] + [Volume down] for a few seconds
+- Usually, you can take a screenshot of your smartphone by pressing *Power* + *Volume down* for a few seconds.
-- Please use the following **template**: 
+- Please use the following **[template](.github/ISSUE_TEMPLATE/bug_report.md)**.
-
-**App version**: 1.x (from Google Play/F-Store/Custom build)
-
-**Android version**: 5.x [Especially mention custom roms!]
-
-**Device model**: 
-
-**Expected behaviour**: 
-
-**Current behaviour**: 
-
-**First occured**: Version 1.x / about x days/weeks ago
-
-**Steps to reproduce**:
-
-1. Do this
-1. Do that
-
-**Environment**: Settings you have changed, e.g. Auto Download. "Unusual" devices you use, e.g. Bluetooth headphones.
-
-**Stacktrace/Logcat**: [if available]
-```
-...
-```
 
 
 How to submit a feature request
 -------------------------------
 - Make sure you are using the latest version of AntennaPod. Perhaps the feature you are looking for has already been implemented.
-- Use the search function to see if someone else has already submitted the same feature request. 
+- Use the search function to see if someone else has already submitted the same feature request. If there is another request already, please upvote the first post instead of commenting something like "I also want this".
-- If an issue has already been opened, see if you can add anything useful to it.
+- To make it easier for us to keep track of requests, please only make one feature request per issue.
-- Otherwise, create a new issue on the "issues" page
+- Give a brief explanation about the problem that may currently exist and how your requested feature solves this problem.
-- To make it easier for us to keep track of requests, please only make one feature request per issue
+- 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.
-- Give a brief explanation about the problem that currently exists and why your requested feature solves this problem.
+
-- Try do be as specific as possible. Please not only explain *what* the feature does, but also *how*. When your request is about changing or extending the UI, describe what the UI would look like and how the user would interact with it.
 
 Translating AntennaPod
 ----------------------
-If you would like to translate the app into another language or improve an existing translation, you can visit the [Transifex project page](https://www.transifex.com/projects/p/antennapod/). From there, you can either join a language team if it already exists or create a new language team.
+If you would like to translate the app into another language or improve an existing translation, you can visit the [Transifex project page](https://www.transifex.com/antennapod/antennapod/). From there, you can either join a language team if it already exists or create a new language team.
 
-Submit a pull-request
+
+Submit a pull request
 ---------------------
 - If you want to work on a feature that has been requested or fix a bug that has been reported on the "issues" page, add a comment to it so that other people know that you are working on it.
-- Fork the repository  
+- Fork the repository.
-- Almost all changes of AntennaPod are done on the `develop` branch. If a new version of AntennaPod is released, the `develop` branch is merged into `master`. As a result, the `master` branch probably doesn't contain the latest changes when you are reading this. Please make sure that you are branching from `develop`! Otherwise, there might be a lot of merge-conflicts when merging your changes into `develop` and therefore it might take longer to review your pull-request. Exceptions are changes in files like README.md, CONTRIBUTING.md and other files that are not directly related to the source code.  
+- Almost all changes of AntennaPod are done on the `develop` branch. If a new version of AntennaPod is released, the `develop` branch is merged into `master`. As a result, the `master` branch probably doesn't contain the latest changes when you are reading this. Please make sure that you are branching from `develop`! Otherwise, there might be a lot of merge-conflicts when merging your changes into `develop` and therefore it might take longer to review your pull-request. Exceptions are changes in files like README.md, CONTRIBUTING.md, and other files that are not directly related to the source code.
-- If your pull-request fixes a bug that has been reported or implements a feature that has been requested in another issue, try to mention it so that it can be closed once your pull-request has been merged. If you use special keywords in the [commit comment](https://help.github.com/articles/closing-issues-via-commit-messages/) or [pull request text](https://github.com/blog/1506-closing-issues-via-pull-requests) github will close the issues automatically when the changes lands at the master branch.
+- If your pull request fixes a bug that has been reported or implements a feature that has been requested in another issue, try to mention it so that it can be closed once your pull request has been merged. If you use special keywords in the [commit comment](https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue) or [pull request text](https://github.blog/2013-05-14-closing-issues-via-pull-requests/), GitHub will close the issue(s) automatically when the changes land on the master branch.
-- Although not every part of AntennaPod's source code is fully documented yet, it would be very nice if you could add documentation to your changes if it is a larger pull-request.  
+- Although not every part of AntennaPod's source code is fully documented yet, it would be very nice if you could add documentation to your changes if it is a larger pull request.
-- If possible, add unit tests for your pull-request and make sure that they pass. Information on how to add unit tests and run them can be found here: [TODO] 
+- If possible, add unit tests for your pull request and make sure that they pass. Information on how to add unit tests and run them can be found here: (TODO)
+
 
 Improving this file
 -------------------
-If you think this file needs clarification or additional information on certain topics, feel free to improve it via pull-requests or ask a question on the issues section.
+If you think this file needs clarification or additional information on certain topics, feel free to improve it via pull requests or by opening an issue.

app/build.gradle

@@ -10,17 +10,19 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        multiDexEnabled false
-        vectorDrawables.useSupportLibrary true
         // Version code schema:
         // "1.2.3-SNAPSHOT" -> 1020300
         // "1.2.3-RC4"      -> 1020304
         // "1.2.3"          -> 1020395
         versionCode 2000002
         versionName "2.0.0-alpha2"
+
+        multiDexEnabled false
+        vectorDrawables.useSupportLibrary true
+        vectorDrawables.generatedDensities = []
+
         testApplicationId "de.test.antennapod"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables.generatedDensities = []
 
         def commit = "Unknown commit"
         try {
@@ -62,8 +64,6 @@ android {
     }
 
     buildTypes {
-        def STRING = "String"
-
         debug {
             applicationIdSuffix ".debug"
             resValue "string", "provider_authority", "de.danoeh.antennapod.debug.provider"
@@ -138,18 +138,17 @@ dependencies {
         System.out.println("app: free build hack, skipping some dependencies")
     }
 
-    annotationProcessor 'androidx.annotation:annotation:1.1.0'
+    annotationProcessor "androidx.annotation:annotation:$annotationVersion"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "androidx.appcompat:appcompat:$appcompatVersion"
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'androidx.media:media:1.1.0'
+    implementation "androidx.media:media:$mediaVersion"
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation "androidx.preference:preference:$preferenceVersion"
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
     implementation "androidx.work:work-runtime:$workManagerVersion"
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation "com.google.android.material:material:$googleMaterialVersion"
 
-    compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion"
     implementation "org.apache.commons:commons-lang3:$commonslangVersion"
     implementation "commons-io:commons-io:$commonsioVersion"
     implementation "org.jsoup:jsoup:$jsoupVersion"
@@ -165,13 +164,15 @@ dependencies {
 
     implementation "com.joanzapata.iconify:android-iconify-fontawesome:$iconifyVersion"
     implementation "com.joanzapata.iconify:android-iconify-material:$iconifyVersion"
-    implementation "com.yqritc:recyclerview-flexibledivider:$recyclerviewFlexibledividerVersion"
+    implementation 'com.yqritc:recyclerview-flexibledivider:1.4.0'
-    implementation "com.github.shts:TriangleLabelView:$triangleLabelViewVersion"
+    implementation 'com.github.shts:TriangleLabelView:1.1.2'
     implementation 'com.leinardi.android:speed-dial:3.1.1'
     implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion"
     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.skydoves:balloon:1.1.5'
+
+    compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion"
 
     androidTestImplementation "org.awaitility:awaitility:$awaitilityVersion"
     androidTestImplementation 'com.nanohttpd:nanohttpd:2.1.1'
@@ -179,8 +180,8 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
     androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
     androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation "androidx.test:runner:$runnerVersion"
-    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation "androidx.test:rules:$rulesVersion"
 }
 
 if (project.hasProperty("antennaPodPlayPublisherCredentials")) {

build.gradle

@@ -46,31 +46,36 @@ project.ext {
     minSdkVersion = 16
     targetSdkVersion = 28
 
+    // AndroidX
+    annotationVersion = "1.1.0"
+    appcompatVersion = "1.1.0"
+    mediaVersion = "1.1.0"
+    preferenceVersion = "1.1.1"
     workManagerVersion = "2.3.4"
-    espressoVersion = "3.2.0"
+    googleMaterialVersion = "1.1.0"
-    awaitilityVersion = "3.1.6"
+
-    commonsioVersion = "2.5"
+    // Third-party
     commonslangVersion = "3.6"
-    eventbusVersion = "3.2.0"
+    commonsioVersion = "2.5"
-    glideVersion = "4.8.0"
-    glideOkhttpIntegrationVersion = "4.8.0"
-    iconifyVersion = "2.2.2"
     jsoupVersion = "1.11.2"
+    glideVersion = "4.8.0"
     okhttpVersion = "3.12.10"
     okioVersion = "1.17.5"
-    recyclerviewFlexibledividerVersion = "1.4.0"
+    eventbusVersion = "3.2.0"
-    robotiumSoloVersion = "5.6.3"
     rxAndroidVersion = "2.1.1"
     rxJavaVersion = "2.2.2"
-    rxJavaRulesVersion = "1.3.3.0"
+    iconifyVersion = "2.2.2"
-    triangleLabelViewVersion = "1.1.2"
-
-    exoPlayerVersion = "2.10.8"
     audioPlayerVersion = "v1.0.17"
 
-    castCompanionLibVer = "2.9.1"
+    // Google Play build
-    playServicesVersion = "8.4.0"
     wearableSupportVersion = "2.6.0"
+
+    //Tests
+    awaitilityVersion = "3.1.6"
+    robotiumSoloVersion = "5.6.3"
+    espressoVersion = "3.2.0"
+    runnerVersion = "1.2.0"
+    rulesVersion = "1.2.0"
 }
 
 wrapper {

core/build.gradle

@@ -6,9 +6,9 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
+
         multiDexEnabled false
-        versionCode 1
+
-        versionName "1.0"
         testApplicationId "de.danoeh.antennapod.core.tests"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -55,19 +55,19 @@ android {
 }
 
 dependencies {
-    annotationProcessor 'androidx.annotation:annotation:1.1.0'
+    annotationProcessor "androidx.annotation:annotation:$annotationVersion"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "androidx.appcompat:appcompat:$appcompatVersion"
-    implementation 'androidx.media:media:1.1.0'
+    implementation "androidx.media:media:$mediaVersion"
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation "androidx.preference:preference:$preferenceVersion"
     implementation "androidx.work:work-runtime:$workManagerVersion"
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation "com.google.android.material:material:$googleMaterialVersion"
 
     implementation "org.apache.commons:commons-lang3:$commonslangVersion"
     implementation "commons-io:commons-io:$commonsioVersion"
     implementation "org.jsoup:jsoup:$jsoupVersion"
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
-    implementation "com.github.bumptech.glide:okhttp3-integration:$glideOkhttpIntegrationVersion@aar"
+    implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion@aar"
     implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
     implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
     implementation "com.squareup.okio:okio:$okioVersion"
@@ -76,15 +76,15 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
     implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
 
-    implementation "com.google.android.exoplayer:exoplayer:$exoPlayerVersion"
+    implementation 'com.google.android.exoplayer:exoplayer:2.10.8'
     implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion"
 
     // Add casting features
     // free build hack: skip some dependencies
     if (!doFreeBuild()) {
-        playApi "com.google.android.libraries.cast.companionlibrary:ccl:$castCompanionLibVer"
+        playApi 'com.google.android.libraries.cast.companionlibrary:ccl:2.9.1'
         api 'androidx.mediarouter:mediarouter:1.0.0'
-        playApi "com.google.android.gms:play-services-cast:$playServicesVersion"
+        playApi 'com.google.android.gms:play-services-cast:8.4.0'
         api "com.google.android.support:wearable:$wearableSupportVersion"
         compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion"
     } else {
@@ -96,8 +96,8 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:1.10.19'
     androidTestImplementation "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation "androidx.test:runner:$runnerVersion"
-    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation "androidx.test:rules:$rulesVersion"
 }
 
 tasks.withType(Test) {

createTranslatorsList.py

@@ -31,7 +31,7 @@ for lang in r.json():
             langName = lang['language_code']
             print('\033[91mLanguage code not found:' + langCode + '\033[0m')
 
-    joinedTranslators = ', '.join(langContributers).replace(';', '');
+    joinedTranslators = ', '.join(langContributers).replace(';', '')
     contributorsFile.write(langName + ": " + joinedTranslators + '\n')
     csvFile.write(langName + ';' + joinedTranslators + '\n')
     print(langName + ';' + joinedTranslators)