From 50150730df677fcfa64fab996519001d9d4794c4 Mon Sep 17 00:00:00 2001
From: VarunBarad <barad.varun29@gmail.com>
Date: Sat, 3 Dec 2016 21:46:22 +0530
Subject: [PATCH 1/3] Add branded launch screen.

---
 app/src/main/AndroidManifest.xml              | 11 +++++++--
 .../antennapod/activity/SplashActivity.java   | 23 +++++++++++++++++++
 core/src/main/res/drawable/bg_splash.xml      | 13 +++++++++++
 core/src/main/res/values/styles.xml           |  4 ++++
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
 create mode 100644 core/src/main/res/drawable/bg_splash.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3c27998b4..fe313684a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,15 +42,22 @@
             android:value="AEdPqrEAAAAI3a05VToCTlqBymJrbFGaKQMvF-bBAuLsOdavBA"/>
 
         <activity
-            android:name=".activity.MainActivity"
+            android:name=".activity.SplashActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTask"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:theme="@style/Theme.AntennaPod.Dark.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity
+            android:name=".activity.MainActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTask"
+            android:label="@string/app_name">
+        </activity>
         <activity
             android:name=".activity.AudioplayerActivity"
             android:launchMode="singleTop">
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
new file mode 100644
index 000000000..b92ac8577
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java
@@ -0,0 +1,23 @@
+package de.danoeh.antennapod.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+/**
+ * Creator: vbarad
+ * Date: 2016-12-03
+ * Project: AntennaPod
+ */
+
+public class SplashActivity extends AppCompatActivity {
+  @Override
+  protected void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    Intent intent = new Intent(this, MainActivity.class);
+    startActivity(intent);
+    finish();
+  }
+}
diff --git a/core/src/main/res/drawable/bg_splash.xml b/core/src/main/res/drawable/bg_splash.xml
new file mode 100644
index 000000000..dd66e3083
--- /dev/null
+++ b/core/src/main/res/drawable/bg_splash.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:drawable="@color/overlay_dark"/>
+
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/ic_launcher"/>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 9b20fdd02..4f228f8f1 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -239,6 +239,10 @@
         <item name="attr/ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
     </style>
 
+    <style name="Theme.AntennaPod.Dark.Splash" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowBackground">@drawable/bg_splash</item>
+    </style>
+
     <style name="Theme.AntennaPod.VideoPlayer" parent="@style/Theme.AntennaPod.Dark">
         <item name="windowActionBarOverlay">true</item>
     </style>

From 28f4ba968d50cff1a770c6a81e5fa352569af50d Mon Sep 17 00:00:00 2001
From: VarunBarad <barad.varun29@gmail.com>
Date: Sun, 4 Dec 2016 08:42:16 +0530
Subject: [PATCH 2/3] Add MultiDexSupport.

---
 app/build.gradle                                       | 2 ++
 app/src/main/java/de/danoeh/antennapod/PodcastApp.java | 4 ++--
 build.gradle                                           | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d15427aef..b2ddb0101 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,6 +30,7 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
+        multiDexEnabled true
         versionCode getMyVersionCode()
         versionName "${getMyVersionName()}"
         testApplicationId "de.test.antennapod"
@@ -126,6 +127,7 @@ dependencies {
     } else {
         System.out.println("app: free build hack, skipping some dependencies")
     }
+    compile "com.android.support:multidex:$multiDexVersion"
     compile "com.android.support:support-v4:$supportVersion"
     compile "com.android.support:appcompat-v7:$supportVersion"
     compile "com.android.support:design:$supportVersion"
diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index f6a8db5fb..25af9bce3 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -1,8 +1,8 @@
 package de.danoeh.antennapod;
 
-import android.app.Application;
 import android.os.Build;
 import android.os.StrictMode;
+import android.support.multidex.MultiDexApplication;
 
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.fonts.FontAwesomeModule;
@@ -13,7 +13,7 @@ import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.spa.SPAUtil;
 
 /** Main application class. */
-public class PodcastApp extends Application {
+public class PodcastApp extends MultiDexApplication {
 
     // make sure that ClientConfigurator executes its static code
     static {
diff --git a/build.gradle b/build.gradle
index dcb996909..b0fb02c44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,6 +42,7 @@ project.ext {
     minSdkVersion = 10
     targetSdkVersion = 23
 
+    multiDexVersion = "1.0.1"
     supportVersion = "23.4.0"
     commonsioVersion = "2.4"
     commonslangVersion = "3.4"

From 234caf3cd59cfec2af0edf6101aafa4b68f6d7de Mon Sep 17 00:00:00 2001
From: VarunBarad <barad.varun29@gmail.com>
Date: Thu, 8 Dec 2016 19:37:02 +0530
Subject: [PATCH 3/3] Revert to remove MultiDex support.

This reverts commit 9406108c61e42b6ad8942e5cce0c87c01c061473, reversing
changes made to b4233f004c5df3fcaae08b0b88e4c0bd8ae3a747.
---
 app/build.gradle                                       | 2 --
 app/src/main/java/de/danoeh/antennapod/PodcastApp.java | 4 ++--
 build.gradle                                           | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b2ddb0101..d15427aef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        multiDexEnabled true
         versionCode getMyVersionCode()
         versionName "${getMyVersionName()}"
         testApplicationId "de.test.antennapod"
@@ -127,7 +126,6 @@ dependencies {
     } else {
         System.out.println("app: free build hack, skipping some dependencies")
     }
-    compile "com.android.support:multidex:$multiDexVersion"
     compile "com.android.support:support-v4:$supportVersion"
     compile "com.android.support:appcompat-v7:$supportVersion"
     compile "com.android.support:design:$supportVersion"
diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index 25af9bce3..f6a8db5fb 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -1,8 +1,8 @@
 package de.danoeh.antennapod;
 
+import android.app.Application;
 import android.os.Build;
 import android.os.StrictMode;
-import android.support.multidex.MultiDexApplication;
 
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.fonts.FontAwesomeModule;
@@ -13,7 +13,7 @@ import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.spa.SPAUtil;
 
 /** Main application class. */
-public class PodcastApp extends MultiDexApplication {
+public class PodcastApp extends Application {
 
     // make sure that ClientConfigurator executes its static code
     static {
diff --git a/build.gradle b/build.gradle
index b0fb02c44..dcb996909 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,6 @@ project.ext {
     minSdkVersion = 10
     targetSdkVersion = 23
 
-    multiDexVersion = "1.0.1"
     supportVersion = "23.4.0"
     commonsioVersion = "2.4"
     commonslangVersion = "3.4"