Merge branch 'master' into develop

11 files changed, 61 insertions, 39 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 6cba6549b..7457049dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         // Version code schema:
         // "1.2.3-beta4"    -> 1020304
         // "1.2.3"          -> 1020395
-        versionCode 2050296
-        versionName "2.5.2"
+        versionCode 2060195
+        versionName "2.6.1"
 
         def commit = ""
         try {
diff --git a/app/src/main/assets/developers.csv b/app/src/main/assets/developers.csv
index 2c6cec48b..675f3cf93 100644
--- a/app/src/main/assets/developers.csv
+++ b/app/src/main/assets/developers.csv
@@ -4,8 +4,8 @@ mfietz;6860662;Maintainer (retired)
 TomHennen;5216560;Maintainer (retired)
 orionlee;250644;Contributor
 domingos86;9538859;Contributor
-tonytamsf;149837;Contributor
 TacoTheDank;32376686;Contributor
+tonytamsf;149837;Contributor
 damoasda;46045854;Contributor
 andersonvom;69922;Contributor
 shortspider;5712543;Contributor
@@ -53,6 +53,7 @@ bibz;5141956;Contributor
 hzulla;1705654;Contributor
 deandreamatias;21011641;Contributor
 MeirAtIMDDE;4421079;Contributor
+cketti;218061;Contributor
 egsavage;126165;Contributor
 ligi;111600;Contributor
 Xeitor;8825715;Contributor
@@ -130,6 +131,7 @@ edwinhere;19705425;Contributor
 eirikv;4076243;Contributor
 eerden;277513;Contributor
 Geist5000;37940313;Contributor
+IordanisKokk;72551397;Contributor
 jklippel;8657220;Contributor
 jannic;232606;Contributor
 Foso;5015532;Contributor
@@ -152,7 +154,10 @@ max-wittig;6639323;Contributor
 Mengshi24;58278376;Contributor
 MolarAmbiguity;10541979;Contributor
 mounirlamouri;573590;Contributor
+nicoolasj;63880378;Contributor
 nikhil097;35090769;Contributor
+nproth;48482306;Contributor
+oliver;2344;Contributor
 panoreak;25068506;Contributor
 patrickjkennedy;8617261;Contributor
 ortylp;470439;Contributor
@@ -166,6 +171,7 @@ sonnayasomnambula;7716779;Contributor
 sethoscope;534043;Contributor
 shantanahardy;26757164;Contributor
 shombando;42972338;Contributor
+Silverwarriorin;46795935;Contributor
 danners;116551;Contributor
 corecode;177979;Contributor
 vimsick;20211590;Contributor
@@ -185,7 +191,9 @@ fossterer;4236021;Contributor
 sak96;26397224;Contributor
 gregoryjtom;32783177;Contributor
 lightonflux;1377943;Contributor
+loucasal;25279797;Contributor
 minusf;3632883;Contributor
+NWuensche;15856197;Contributor
 rubenh-be;22374542;Contributor
 s3lph;5564491;Contributor
 silansuslu;72400543;Contributor
diff --git a/app/src/main/assets/translators.csv b/app/src/main/assets/translators.csv
index 36ed00142..e60f85313 100644
--- a/app/src/main/assets/translators.csv
+++ b/app/src/main/assets/translators.csv
@@ -1,45 +1,47 @@
 Arabic;abuzar3.khalid, AhmedHll, badarotti, HeshamTB, keunes, Mehyar, mhamade, moftasa, mohmans, MustafaAlgurabi, nabilMaghura, rex07, shubbar
 Asturian (ast_ES);enolp, keunes
 Azerbaijani;5NOER227O
-Basque;gaztainalde, IngrownMink4, keunes, Osoitz, pospolos
+Basque;bipoza, gaztainalde, IngrownMink4, keunes, Osoitz, pospolos
+Bengali;laggybird
 Breton;Belvar, Eorn, Iriep, keunes, technozuzici
 Bulgarian;keunes, ma4ko, ppk89, solusitor, x7ype
-Catalan;arseru, carles.llacer, dvd1985, exort12, IvanAmarante, javiercoll, keunes, Kintu, lambdani, marcmetallextrem, xc70
+Catalan;arseru, badlop, bluegeekgh, carles.llacer, dvd1985, exort12, IvanAmarante, javiercoll, keunes, Kintu, lambdani, marcmetallextrem, xc70
 Chinese (zh_CN);Biacke, brnme, claybiockiller, cyril3, Felix2yu, gaohongyuan, Guaidaodl, Huck0, iconteral, jhxie, jxj2zzz79pfp9bpo, JY3, keunes, kyleehee, molisiye, owen8877, RainSlide, RangerNJU, Sak94664, spice2wolf, tupunco, wongsyrone, yangyang, yiqiok
 Chinese (zh_TW);bobchao, ijliao, keunes, mapobi, pggdt, ymhuang0808
-Czech (cs_CZ);anotheranonymoususer, elich, Hanzmeister, jjh, md.share, svetlemodry, Thomaash
+Czech (cs_CZ);anotheranonymoususer, befeleme, elich, Hanzmeister, jjh, McLenin666, md.share, svetlemodry, Thomaash, viotalJiplk
 Danish;deusdenton, ERYpTION, JFreak, jhertel, keunes, mikini, petterbejo, SebastianKiwiDk
-Dutch;e2jk, keunes, mijnheer, rwv, Vistaus
+Dutch;e2jk, keunes, mijnheer, oldblue, rwv, Vistaus
 Estonian;beez276, Eraser, keunes, mahfiaz
 Finnish;Ban3, keunes, ktstmu, Kuutar, noppa, Sahtor, scop, teemue
-French;5NOER227O, ayiniho, ChaoticMind, clombion, Cornegidouille, e2jk, keunes, klintom, Kuscoo, lacouture, LouFex, Matth78, petterbejo, Poussinou, RomainTT, sterylmreep
+French;5NOER227O, ayiniho, ChaoticMind, clombion, Cornegidouille, Daremo, e2jk, keunes, klintom, Kuscoo, lacouture, LouFex, Matth78, petterbejo, Poussinou, RomainTT, sterylmreep, teamon
 Galician;antiparvos, pikamoku, Raichely
-German;5NOER227O, _Er, axre, ByteHamster, ceving, dadosch, DerSilly, elkangaroo, enz, f_grubm, finsterwalder, forght, hbilke, HolgerJeromin, JoeMcFly, jokap, JoniArida, JonOfUs, kalei, keunes, Macusercom, max.wittig, mfietz, Michael_Strecke, petterbejo, pudeeh, Quiss42, repat, sadfgdf, timo.rohwedder, toaskoas, Tobiasff3200, tomte, tweimer, Willhelm, ypid
+German;5NOER227O, _Er, axre, ByteHamster, Ceekay, ceving, dadosch, datesastick, DerSilly, elkangaroo, enz, Erc187, f_grubm, finsterwalder, forght, hbilke, HolgerJeromin, JMAN, JoeMcFly, jokap, JoniArida, JonOfUs, kalei, keunes, Macusercom, max.wittig, mfietz, Michael_Strecke, mkida, petterbejo, pudeeh, Quiss42, repat, sadfgdf, Sargon_Isa, teamon, thetrash23, timo.rohwedder, toaskoas, Tobiasff3200, tomte, Tonne11, tweimer, VfBFan, Willhelm, ypid
 Hebrew (he_IL);amir.dafnyman, E1i9, mongoose4004, pinkasey, rellieberman, Yaron
 Hindi (hi_IN);keunes, purple.coder, siddhusengar, thelazyoxymoron
 Hu;hurrikan, keunes, lna91, lomapur, marthynw, meskobalazs, naren93
 Icelandic;keunes, marthjod
 Indonesian;dbrw, justch, keunes, levirs565, liimee
-Italian (it_IT);aalex70, allin, alvami, Bonnee, dontknowcris, giuseppep, Guybrush88, ilmanzo, keunes, m.chinni, marco_pag, mircocau, neonsoftware, niccord, salorock, theloca95
-Japanese;ayiniho, keunes, KotaKato, Naofumi, sh3llc4t, TranslatorG
+Italian (it_IT);aalex70, allin, alvami, Bonnee, datesastick, dontknowcris, giuseppep, Guybrush88, ilmanzo, juanjom, keunes, lu.por, m.chinni, marco_pag, mat650, mircocau, neonsoftware, niccord, salorock, theloca95
+Japanese;ayiniho, keunes, KotaKato, Naofumi, sh3llc4t, tko_cactus, TranslatorG
 Kannada (kn_IN);chiraag.nataraj, keunes, thejeshgn
 Ko;changwoo, eshc123, keunes, libliboom
+Latin;nivaca
 Lithuanian;keunes, naglis, Sharper
 Macedonian;krisfremen
-Malayalam;joice, keunes, rashivkp
+Malayalam;joice, keunes, KiranS, rashivkp
 Modern Greek (1453-);AnimaRain, antonist, keunes, pavlosv
 Norwegian Bokmål (nb_NO);abstrakct, ahysing, bablecopherye, corkie, forteller, heraldo, jakobkg, keunes, kongk, sevenmaster, tc5, timbast, ttick
 Persian;ahangarha, danialbehzadi, ebadi, ebraminio, F7D, hamidrezabayat76, keunes, sinamoghaddas
-Polish (pl_PL);befeleme, ewm, hiro2020, Iwangelion, kamila.miodek1991, keunes, lomapur, mandlus, maniexx, Mephistofeles, Rakowy_Manaska, shark103, tyle
-Portuguese;emansije, keunes, lecalam, smarquespt, WalkerPt
-Portuguese (pt_BR);alexupits, alysonborges, amalvarenga, andersonvom, aracnus, arua, bandreghetti, caioau, carlo_valente, castrors, edman, keunes, lipefire, mbaltar, olivoto, rogervezaro, RubeensVinicius, SamWilliam, tepadilha
+Polish (pl_PL);befeleme, ewm, hiro2020, Iwangelion, kamila.miodek1991, keunes, lomapur, mandlus, maniexx, Mephistofeles, millup, Rakowy_Manaska, shark103, tyle
+Portuguese;emansije, jmelo461, keunes, lecalam, smarquespt, WalkerPt
+Portuguese (pt_BR);alexupits, alysonborges, amalvarenga, andersonvom, aracnus, arua, bandreghetti, caioau, carlo_valente, castrors, jmelo461, keunes, lipefire, mbaltar, olivoto, rogervezaro, RubeensVinicius, SamWilliam, tepadilha, tschertel, ziul123
 Romanian (ro_RO);AdrianMirica, corneliu.e, fuzzmz, keunes, mozartro, ralienpp
-Russian (ru_RU);ashed, btimofeev, Duke_Raven, flexagoon, gammja, homocomputeris, IgorPolyakov, keunes, mercutiy, nachoman, null, overmind88, Platun0v, PtilopsisLeucotis, s.chebotar, tepxd, un_logic, Vladryyu, whereisthetea
-Slovak;ati3, jose1711, keunes, marulinko, real_name, tiborepcek
+Russian (ru_RU);ashed, btimofeev, Duke_Raven, flexagoon, gammja, homocomputeris, IgorPolyakov, keunes, mercutiy, nachoman, null, overmind88, Platun0v, PtilopsisLeucotis, s.chebotar, tepxd, un_logic, Vladryyu, whereisthetea, yako
+Slovak;ati3, jose1711, keunes, marulinko, McLenin666, real_name, tiborepcek
 Slovenian (sl_SI);anzepintar, asovic, keunes, panter23, TheFireFighter, trus2
-Spanish;AleksSyntek, andersonvom, andrespelaezp, arseru, Atreyu94, CaeM0R, carlos.levy, cartojo, deandreamatias, devarops, dvd1985, elojodepajaro, Fitoschido, frandavid100, hard_ware, javiercoll, keunes, kiekie, LatinSuD, leogrignafini, meanderingDot, nivaca, rafael.osuna, technozuzici, tres.14159, vfmatzkin, wakutiteo
+Spanish;AleksSyntek, andersonvom, andrespelaezp, arseru, Atreyu94, badlop, CaeM0R, carlos.levy, cartojo, deandreamatias, devarops, dvd1985, elojodepajaro, Fitoschido, frandavid100, hard_ware, javiercoll, keunes, kiekie, LatinSuD, leogrignafini, meanderingDot, nivaca, rafael.osuna, technozuzici, tres.14159, vfmatzkin, wakutiteo, ziul123
 Swahili (macrolanguage);1silvester, keunes, kmtra
-Swedish (sv_SE);aiix, bpnilsson, keunes, nilso, TwoD, victorhggqvst
+Swedish (sv_SE);aiix, bittin, bpnilsson, keunes, LinAGKar, nilso, TwoD, victorhggqvst
 Tatar;seber
 Telugu;keunes, veeven
 Turkish;AhmedDuran, alianilkocak, AliGaygisiz, androtuna, brsata, Erdy, keunes, overbite, Slsdem
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 954a6c2f6..9ffade1ca 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -36,6 +36,7 @@ import androidx.core.view.WindowCompat;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import com.bumptech.glide.Glide;
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.dialog.VariableSpeedDialog;
 import de.danoeh.antennapod.event.playback.BufferUpdateEvent;
 import de.danoeh.antennapod.event.playback.PlaybackPositionEvent;
 import de.danoeh.antennapod.event.PlayerErrorEvent;
@@ -591,6 +592,7 @@ public class VideoplayerActivity extends CastEnabledActivity implements SeekBar.
 
         menu.findItem(R.id.player_switch_to_audio_only).setVisible(true);
         menu.findItem(R.id.audio_controls).setIcon(R.drawable.ic_sliders);
+        menu.findItem(R.id.playback_speed).setVisible(true);
         return true;
     }
 
@@ -640,6 +642,8 @@ public class VideoplayerActivity extends CastEnabledActivity implements SeekBar.
         } else if (item.getItemId() == R.id.share_item && feedItem != null) {
             ShareDialog shareDialog = ShareDialog.newInstance(feedItem);
             shareDialog.show(getSupportFragmentManager(), "ShareEpisodeDialog");
+        } else if (item.getItemId() == R.id.playback_speed) {
+            new VariableSpeedDialog().show(getSupportFragmentManager(), null);
         } else {
             return false;
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 442076d35..4a057196a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -237,6 +237,7 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder>
         // reset for re-use
         holder.count.setVisibility(View.GONE);
         holder.count.setOnClickListener(null);
+        holder.count.setClickable(false);
 
         String tag = fragmentTags.get(position);
         if (tag.equals(QueueFragment.TAG)) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
index 7902a4988..bca0f8640 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
@@ -185,6 +185,9 @@ public class FeedInfoFragment extends Fragment implements Toolbar.OnMenuItemClic
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
+        if (header == null || infoContainer == null) {
+            return;
+        }
         int horizontalSpacing = (int) getResources().getDimension(R.dimen.additional_horizontal_spacing);
         header.setPadding(horizontalSpacing, header.getPaddingTop(), horizontalSpacing, header.getPaddingBottom());
         infoContainer.setPadding(horizontalSpacing, infoContainer.getPaddingTop(),
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
index 80a65e518..f4fafb0ac 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
@@ -162,8 +162,11 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
             public void onScrolled(@NonNull RecyclerView view, int deltaX, int deltaY) {
                 super.onScrolled(view, deltaX, deltaY);
                 boolean hasMorePages = feed != null && feed.isPaged() && feed.getNextPageLink() != null;
-                nextPageLoader.getRoot().setVisibility(
-                        (viewBinding.recyclerView.isScrolledToBottom() && hasMorePages) ? View.VISIBLE : View.GONE);
+                boolean pageLoaderVisible = viewBinding.recyclerView.isScrolledToBottom() && hasMorePages;
+                nextPageLoader.getRoot().setVisibility(pageLoaderVisible ? View.VISIBLE : View.GONE);
+                viewBinding.recyclerView.setPadding(
+                        viewBinding.recyclerView.getPaddingLeft(), 0, viewBinding.recyclerView.getPaddingRight(),
+                        pageLoaderVisible ? nextPageLoader.getRoot().getMeasuredHeight() : 0);
             }
         });
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
index 94c0b0a41..10f80441a 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
@@ -146,13 +146,8 @@ public class SubscriptionFragment extends Fragment
         }
 
         subscriptionRecycler = root.findViewById(R.id.subscriptions_grid);
-        GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(),
-                prefs.getInt(PREF_NUM_COLUMNS, getDefaultNumOfColumns()),
-                RecyclerView.VERTICAL,
-                false);
-        subscriptionRecycler.setLayoutManager(gridLayoutManager);
+        setColumnNumber(prefs.getInt(PREF_NUM_COLUMNS, getDefaultNumOfColumns()));
         subscriptionRecycler.addItemDecoration(new SubscriptionsRecyclerAdapter.GridDividerItemDecorator());
-        gridLayoutManager.setSpanCount(prefs.getInt(PREF_NUM_COLUMNS, getDefaultNumOfColumns()));
         registerForContextMenu(subscriptionRecycler);
         subscriptionAddButton = root.findViewById(R.id.subscriptions_add);
         progressBar = root.findViewById(R.id.progLoading);
@@ -239,9 +234,9 @@ public class SubscriptionFragment extends Fragment
     }
 
     private void setColumnNumber(int columns) {
-        GridLayoutManager gridLayoutManager = (GridLayoutManager) subscriptionRecycler.getLayoutManager();
-        gridLayoutManager.setSpanCount(columns);
-        subscriptionAdapter.notifyDataSetChanged();
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(),
+                columns, RecyclerView.VERTICAL, false);
+        subscriptionRecycler.setLayoutManager(gridLayoutManager);
         prefs.edit().putInt(PREF_NUM_COLUMNS, columns).apply();
         refreshToolbarState();
     }
diff --git a/app/src/main/play/release-notes/en-US/default.txt b/app/src/main/play/release-notes/en-US/default.txt
index de4eb38b7..f74f32c72 100644
--- a/app/src/main/play/release-notes/en-US/default.txt
+++ b/app/src/main/play/release-notes/en-US/default.txt
@@ -1,7 +1,6 @@
-- Synchronization with Nextcloud ("GPodder Sync" app) (@thrillfall)
-- 'Duration' filter in podcast-specific auto-download settings (@thomasdomingos)
-- 'Downloaded episodes' screen in Android Auto (@ByteHamster)
-- Tags (previously folders): add to multiple podcasts via multi-select, rename tags (@vbh)
-- Accessibility: more TalkBack (@johnjohndoe @TacoTheDank)
-- Improvements for local feeds, mobile connections, physical keyboard/mouse support
-- Many minor & bigger bug fixes and other improvements
\ No newline at end of file
+∙ Support for podcasting 2.0 chapters (@tonytamsf)
+∙ Statistics: filter based on month/year (@ByteHamster), access via button on Subscriptions toolbar instead of Settings (@IordanisKokk)
+∙ Local feed bug fixes & improvements (@ByteHamster)
+∙ Design improvements (design: George, code: @ByteHamster)
+∙ Update feeds to https if possible, better handle captive portal redirects (@ByteHamster)
+∙ As always, even though we never list it: new & updated translations (thanks to all our lovely translators)
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index 6d96141a2..6bd31ed9d 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -71,7 +71,7 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
             android:scaleType="fitXY"
-            android:src="@drawable/ic_rounded_corner_left" />
+            app:srcCompat="@drawable/ic_rounded_corner_left" />
 
         <ImageView
             android:layout_width="12dp"
@@ -79,7 +79,7 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
             android:scaleType="fitXY"
-            android:src="@drawable/ic_rounded_corner_right" />
+            app:srcCompat="@drawable/ic_rounded_corner_right" />
 
         <androidx.cardview.widget.CardView
             android:id="@+id/coverHolder"
diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml
index 7c66a4d10..ebb0befb0 100644
--- a/app/src/main/res/menu/mediaplayer.xml
+++ b/app/src/main/res/menu/mediaplayer.xml
@@ -36,6 +36,13 @@
     </item>
 
     <item
+        android:id="@+id/playback_speed"
+        android:title="@string/playback_speed"
+        android:visible="false"
+        custom:showAsAction="never">
+    </item>
+
+    <item
         android:id="@+id/open_feed_item"
         android:icon="@drawable/ic_feed"
         custom:showAsAction="collapseActionView"