summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarun Barad <barad.varun29@gmail.com>2016-12-03 21:48:54 +0530
committerGitHub <noreply@github.com>2016-12-03 21:48:54 +0530
commitb4233f004c5df3fcaae08b0b88e4c0bd8ae3a747 (patch)
treed58c1b53660a0e3bacde7a8fcee5a142ee69a633
parent4ff8d5430fb83d54b7ef63132b400033e5cf4392 (diff)
parent50150730df677fcfa64fab996519001d9d4794c4 (diff)
downloadAntennaPod-b4233f004c5df3fcaae08b0b88e4c0bd8ae3a747.zip
Merge pull request #1 from VarunBarad/launch-screen
Add branded launch screen.
-rw-r--r--app/src/main/AndroidManifest.xml11
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java23
-rw-r--r--core/src/main/res/drawable/bg_splash.xml13
-rw-r--r--core/src/main/res/values/styles.xml4
4 files changed, 49 insertions, 2 deletions
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,16 +42,23 @@
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">
<meta-data
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>