Branding upgrade (#6146)

2 files changed, 7 insertions, 26 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
index 4e300ef25..43da309d7 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
@@ -1,15 +1,12 @@
 package de.danoeh.antennapod.activity;
 
+import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Intent;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.Toast;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import android.widget.ProgressBar;
-
-import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.error.CrashReportWriter;
 import de.danoeh.antennapod.storage.database.PodDBAdapter;
 import io.reactivex.Completable;
@@ -19,15 +16,13 @@ import io.reactivex.schedulers.Schedulers;
 /**
  * Shows the AntennaPod logo while waiting for the main activity to start.
  */
-public class SplashActivity extends AppCompatActivity {
+@SuppressLint("CustomSplashScreen")
+public class SplashActivity extends Activity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.splash);
-
-        ProgressBar progressBar = findViewById(R.id.progressBar);
-        progressBar.getIndeterminateDrawable().setColorFilter(
-                new PorterDuffColorFilter(0xffffffff, PorterDuff.Mode.SRC_IN));
+        final View content = findViewById(android.R.id.content);
+        content.getViewTreeObserver().addOnPreDrawListener(() -> false); // Keep splash screen active
 
         Completable.create(subscriber -> {
             // Trigger schema updates
diff --git a/app/src/main/res/layout/splash.xml b/app/src/main/res/layout/splash.xml
deleted file mode 100644
index 126b93481..000000000
--- a/app/src/main/res/layout/splash.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-    <ProgressBar
-            style="?android:attr/progressBarStyle"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="96dp"
-            android:id="@+id/progressBar"/>
-</RelativeLayout>