From c1b54c28db342620b34c1d70de264298b20e4d5a Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 10 Apr 2021 10:14:20 +0200
Subject: Fixed tab flickering

---
 app/src/main/res/layout/audioplayer_fragment.xml | 61 ++++++++++++++----------
 1 file changed, 36 insertions(+), 25 deletions(-)

(limited to 'app')

diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml
index 660e61cdc..c9d443e63 100644
--- a/app/src/main/res/layout/audioplayer_fragment.xml
+++ b/app/src/main/res/layout/audioplayer_fragment.xml
@@ -6,24 +6,44 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <androidx.appcompat.widget.Toolbar
+    <!--
+        While the same visuals could be achieved without this nested layout,
+        RelativeLayout invalidates all its direct children when the playback
+        position is updated. This causes flickering of the tabs every second.
+    -->
+    <LinearLayout
+            android:id="@+id/pagerContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="?attr/actionBarSize"
-            android:theme="?attr/actionBarTheme"
             android:layout_alignParentTop="true"
-            app:navigationIcon="?homeAsUpIndicator"
-            android:id="@+id/toolbar"/>
+            android:layout_above="@id/playtime_layout"
+            android:orientation="vertical"
+            android:layout_marginBottom="12dp">
 
-    <com.google.android.material.tabs.TabLayout
-            android:id="@+id/sliding_tabs"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/toolbar"
-            android:background="?android:attr/windowBackground"
-            app:tabBackground="?attr/selectableItemBackground"
-            app:tabMode="fixed"
-            app:tabGravity="fill"/>
+        <androidx.appcompat.widget.Toolbar
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
+                android:theme="?attr/actionBarTheme"
+                app:navigationIcon="?homeAsUpIndicator"
+                android:id="@+id/toolbar"/>
+
+        <com.google.android.material.tabs.TabLayout
+                android:id="@+id/sliding_tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?android:attr/windowBackground"
+                app:tabBackground="?attr/selectableItemBackground"
+                app:tabMode="fixed"
+                app:tabGravity="fill"/>
+
+        <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/pager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:foreground="?android:windowContentOverlay"/>
+    </LinearLayout>
 
     <FrameLayout
             android:id="@+id/playerFragment"
@@ -34,19 +54,10 @@
             tools:layout_height="@dimen/external_player_height"
             android:elevation="8dp"/>
 
-    <androidx.viewpager2.widget.ViewPager2
-            android:id="@+id/pager"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_above="@id/playtime_layout"
-            android:layout_below="@id/sliding_tabs"
-            android:foreground="?android:windowContentOverlay"
-            android:layout_marginBottom="12dp"/>
-
     <ImageView
             android:layout_width="match_parent"
             android:layout_height="8dp"
-            android:layout_alignBottom="@id/pager"
+            android:layout_alignBottom="@id/pagerContainer"
             android:src="@drawable/bg_gradient"
             app:tint="?android:attr/windowBackground"
             android:importantForAccessibility="no"/>
@@ -56,7 +67,7 @@
             android:alpha="0"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/pager"
+            android:layout_alignBottom="@+id/pagerContainer"
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="12dp"
             app:cardCornerRadius="8dp"
-- 
cgit v1.2.3


From 35259f554391a0be03dbb90ab0839c5ec538702a Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 13 Apr 2021 21:55:58 +0200
Subject: Bumped version to 2.2.0

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/build.gradle b/app/build.gradle
index a2feb40b8..9e4150189 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@ android {
         // Version code schema:
         // "1.2.3-beta4"    -> 1020304
         // "1.2.3"          -> 1020395
-        versionCode 2020003
-        versionName "2.2.0-beta3"
+        versionCode 2020095
+        versionName "2.2.0"
 
         multiDexEnabled false
         vectorDrawables.useSupportLibrary true
-- 
cgit v1.2.3


From 5ad60a8272444fd2c9912273415df686af11cdfc Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 8 May 2021 11:45:08 +0200
Subject: Fixed NPE in ExternalPlayerFragment

---
 .../antennapod/fragment/ExternalPlayerFragment.java  | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'app')

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index d77935910..4efba9277 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -79,17 +79,17 @@ public class ExternalPlayerFragment extends Fragment {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         butPlay.setOnClickListener(v -> {
-            if (controller != null) {
-                if (controller.getMedia().getMediaType() == MediaType.VIDEO
-                        && controller.getStatus() != PlayerStatus.PLAYING) {
-                    controller.playPause();
-                    getContext().startActivity(PlaybackService
-                            .getPlayerActivityIntent(getContext(), controller.getMedia()));
-                } else {
-                    controller.playPause();
-                }
+            if (controller == null) {
+                return;
+            }
+            if (controller.getMedia() != null && controller.getMedia().getMediaType() == MediaType.VIDEO
+                    && controller.getStatus() != PlayerStatus.PLAYING) {
+                controller.playPause();
+                getContext().startActivity(PlaybackService
+                        .getPlayerActivityIntent(getContext(), controller.getMedia()));
+            } else {
+                controller.playPause();
             }
-
         });
         loadMediaInfo();
     }
-- 
cgit v1.2.3


From d9fdca4d03e14061d324498ca4d385d810cf7c12 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 13 May 2021 21:40:58 +0200
Subject: Bumped version to 2.2.1

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/build.gradle b/app/build.gradle
index 9e4150189..e5a7aefa2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@ android {
         // Version code schema:
         // "1.2.3-beta4"    -> 1020304
         // "1.2.3"          -> 1020395
-        versionCode 2020095
-        versionName "2.2.0"
+        versionCode 2020195
+        versionName "2.2.1"
 
         multiDexEnabled false
         vectorDrawables.useSupportLibrary true
-- 
cgit v1.2.3